From 54fccafe855ef0ce83a4350cd1dc5103777a2c63 Mon Sep 17 00:00:00 2001 From: vanzhiganov Date: Thu, 26 May 2016 00:45:06 +0300 Subject: [PATCH] 39 QEMU virtual machines --- SWSCloudCore/views/vms/__init__.py | 39 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/SWSCloudCore/views/vms/__init__.py b/SWSCloudCore/views/vms/__init__.py index d8b2fc1..d7194d8 100644 --- a/SWSCloudCore/views/vms/__init__.py +++ b/SWSCloudCore/views/vms/__init__.py @@ -160,25 +160,26 @@ def create(): message_parts.append(u"IPv4: %s" % new_vm['ipv4']) if new_vm['ipv6']: message_parts.append(u"IPv6: %s" % new_vm['ipv6']) - # message_parts.append(u"Пользователь: %s" % new_vm['username']) - # message_parts.append(u"Пароль: %s" % new_container['password']) - # if new_container['ssh_key']: - # message_parts.append(u"SSH ключ: добавлен") - # - # message = '
\n'.join(message_parts) - # subject = u'GoCloud.ru: Новый контейнер' - # lead = u"""Поздравляем с новым контейнером.""" - # callout = u""" - # Для входа в личный кабинет воспользуйтесь - # страницей авторизации. - # """ - # - # user_data = ControllerUsers(session['user_id']).get() - # - # email = ControllerMessagesEmail() - # email.send(title=subject, to=user_data.email, lead=lead, message=message, callout=callout) - # - # return redirect(url_for('containers.index')) + message_parts.append(u"Пользователь: %s" % 'root') + # message_parts.append(u"Пользователь: %s" % new_vm['username']) + message_parts.append(u"Пароль: %s" % new_vm['password']) + if new_vm['ssh_key']: + message_parts.append(u"SSH ключ: добавлен") + + message = '
\n'.join(message_parts) + subject = u'GoCloud.ru: Новый виртуальный сервер' + lead = u"""Поздравляем с новым виртуальным сервером.""" + callout = u""" + Для входа в личный кабинет воспользуйтесь + страницей авторизации. + """ + + user_data = ControllerUsers(session['user_id']).get() + + email = ControllerMessagesEmail() + email.send(title=subject, to=user_data.email, lead=lead, message=message, callout=callout) + + return redirect(url_for('vms.index')) else: # mark ip as free ControllerIps().setfree(select_ip.id)