From 9867c7857c7bbbff35766a67601e48cc29ff4562 Mon Sep 17 00:00:00 2001
From: vanzhiganov <vanzhiganov@ya.ru>
Date: Wed, 15 Jun 2016 15:35:19 +0300
Subject: [PATCH] added sudoer user `administrator`

---
 SWSCloudNode/qemu/__init__.py | 14 +++++++-------
 setup.py                      |  2 +-
 vm/firstboot.sh               |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/SWSCloudNode/qemu/__init__.py b/SWSCloudNode/qemu/__init__.py
index 97de936..f7b61b9 100644
--- a/SWSCloudNode/qemu/__init__.py
+++ b/SWSCloudNode/qemu/__init__.py
@@ -201,19 +201,20 @@ class QEMU:
             "--rootsize=%s" % storage,
             "--swapsize=%s" % swap,
             "--templates=/tmp/libvirt/%s/templates/libvirt" % vm_id,
-            # "--user=ubuntu",
-            # "--name=administrator",
-            # "--pass=%s" % password,
-            # "--ssh-user-key=/tmp/libvirt/%s/authorized_keys" % vm_id,
+            # USER
+            "--user=administrator",
+            "--name=administrator",
+            "--pass=%s" % password,
+            "--ssh-user-key=/tmp/libvirt/%s/authorized_keys" % vm_id,
             "--lock-user",
             "--rootpass=%s" % password,
             "--ssh-key=/tmp/libvirt/%s/authorized_keys" % vm_id,
             "--addpkg=linux-image-generic",
             "--addpkg=vim-nox",
-            "--addpkg=nano",
+            # "--addpkg=nano",
             "--addpkg=unattended-upgrades",
             "--addpkg=acpid",
-            "--addpkg=fail2ban",
+            # "--addpkg=fail2ban",
             "--firstboot=/tmp/libvirt/%s/boot.sh" % vm_id,
             "--mem=%s" % memory,
             "--cpus=%s" % cores,
@@ -227,5 +228,4 @@ class QEMU:
         print ';;;'
         print subprocess.call(' '.join(c), shell=True)
 
-        # os.popen("cd /var/lib/qemu/images/%(hostname)s;/usr/bin/vmbuilder kvm %(os_name)s --suite=%(os_suite)s --flavour=virtual --arch=amd64 --mirror=%(mirror)s -o --qemu=qemu:///system --ip=%(ip)s --gw=%(gw)s --part=/var/lib/qemu/images/%(hostname)s/partition --templates=templates --user=administrator --name=administrator --pass=%(password)s --addpkg=linux-image-generic --addpkg=vim-nox --addpkg=nano --addpkg=unattended-upgrades --addpkg=acpid --firstboot=/var/lib/qemu/images/%(hostname)s/boot.sh --mem=%(memory)s --cpus=%(cores)s --hostname=%(hostname)s --bridge=br0" % values)
         return True
diff --git a/setup.py b/setup.py
index 4fb8168..9281d69 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name='SWSCloudNode',
-    version='3.1.3',
+    version='3.1.4',
     author='Vyacheslav Anzhiganov',
     author_email='vanzhiganov@ya.ru',
     packages=[
diff --git a/vm/firstboot.sh b/vm/firstboot.sh
index 818a8c0..de1699e 100644
--- a/vm/firstboot.sh
+++ b/vm/firstboot.sh
@@ -7,7 +7,7 @@
 # passwd -e administrator
 
 # Remove default `ubuntu` user
-deluser --remove-home --remove-all-files ubuntu
+# deluser --remove-home --remove-all-files ubuntu
 
 # Install openssh-server
 apt-get update