snf-deploy: Fix for vncauthproxy>1.4

ci/schemas/one_node_wheezy/wheezy.conf

@@ -47,7 +47,7 @@ ganeti-haskell = wheezy
 
 [other]
 snf-cloudcms = wheezy
-snf-vncauthproxy = wheezy
+snf-vncauthproxy = unstable
 snf-pithos-webclient = wheezy
 snf-image = wheezy
 snf-network = wheezy

docs/upgrade/upgrade-0.15.rst

@@ -164,17 +164,19 @@ file in the same way as above.
 -------------------------------------------------------
 
 Synnefo v0.15 adds support for snf-vncauthproxy >= 1.5 and drops support for
-older versions. You will have to upgrade snf-vncauthproxy to v1.5 and  configure
-the authentication (users) file (``/var/lib/vncauthproxy/users``).
+older versions. You will have to upgrade snf-vncauthproxy to v1.5 and
+configure the authentication (users) file (``/var/lib/vncauthproxy/users``).
 
-In case you're upgrading from an older snf-vncauthproxy version or it's the
-first time you're installing snf-vncauthproxy, you will prompted to configure
-a vncauthproxy user (see below for more information on user management).
+In case you're upgrading from an older snf-vncauthproxy version or if it's the
+first time you're installing snf-vncauthproxy, you will need to add a
+vncauthproxy user (see below for more information on user management) and
+restart vncauthproxy daemon.
 
 To manage the authentication file, you can use the vncauthproxy-passwd tool,
-to easily add, update and delete users
+to easily add, update and delete users.
 
 To add a user:
+
 .. code-block:: console
 
     # vncauthproxy-passwd /var/lib/vncauthproxy/users synnefo

snf-cyclades-app/setup.py

@@ -68,7 +68,7 @@ INSTALL_REQUIRES = [
     'puka',
     'python-daemon>=1.5.5, <1.6',
     'snf-common',
-    'vncauthproxy>=1.5',
+    'vncauthproxy>1.4',
     'snf-pithos-backend',
     'lockfile>=0.8, <0.9',
     'ipaddr',

snf-deploy/files/etc/apt/sources.list.d/synnefo.wheezy.list

 deb http://ftp.de.debian.org/debian wheezy main non-free contrib
 
 deb http://apt.dev.grnet.gr wheezy/
+deb http://apt.dev.grnet.gr unstable/

snf-deploy/files/etc/synnefo/cyclades.conf

@@ -81,3 +81,8 @@ UI_SYSTEM_IMAGES_OWNERS = {
 }
 
 CYCLADES_BASE_URL = 'https://%CYCLADES%/cyclades'
+
+CYCLADES_VNCAUTHPROXY_OPTS = {
+    'auth_user': 'synnefo',
+    'auth_password': 'synnefo_vnc_pass',
+}

snf-deploy/snfdeploy/fabfile.py

@@ -1312,13 +1312,16 @@ def add_network():
 @roles("cyclades")
 def setup_vncauthproxy():
     debug(env.host, " * Setting up vncauthproxy...")
-    install_package("snf-vncauthproxy")
+    user = "synnefo"
+    salt = "$6$7FUdSvFcWAs3hfVj$"
+    passhash = "ZwvnvpQclTrDYWEwBvZDMRJZNgb6ZUKT1vNsh9NzUIxMpzBuGgMqYxCDTYF"\
+               "6OZcbunDZb88pjL2EIBnzrGMQW1"
     cmd = """
-    echo CHUID="www-data:nogroup" >> /etc/default/vncauthproxy
-    rm /var/log/vncauthproxy/vncauthproxy.log
-    """
+    mkdir /var/lib/vncauthproxy
+    echo '%s:%s%s' > /var/lib/vncauthproxy/users
+    """ % (user, salt, passhash)
     try_run(cmd)
-    try_run("/etc/init.d/vncauthproxy restart")
+    install_package("snf-vncauthproxy")
 
 
 @roles("client")