Merge lp:~saviq/charms/trusty/nova-compute/lxd-no-redundant into lp:~zulcss/charms/trusty/nova-compute/nova-compute-lxd

[Michał Sawicz]

Drop redundant lxd_ prefixes in lxd relation data

[lp:~saviq/charms/trusty/nova-compute/lxd-no-redundant]

149. By Michał Sawicz on 2015-07-28

Adapt to non-prefixed relation data

Unmerged revisions

149. By Michał Sawicz on 2015-07-28

Adapt to non-prefixed relation data

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-07-24 02:24:48 +0000
+++ hooks/nova_compute_utils.py	2015-07-28 14:45:19 +0000
@@ -615,13 +615,13 @@
 @retry_on_exception(5, base_delay=2, exc_type=CalledProcessError)
 def configure_lxd_host(settings, user):
     cmd = ['sudo', '-u', user, 'lxc', 'config', 'set',
-           'core.trust_password', settings['lxd_password']]
+           'core.trust_password', settings['password']]
     check_call(cmd)
 
     p = Popen(['sudo', '-u', user, 'lxc', 'remote', 'add',
-               settings['lxd_hostname'], '%s:8443' % settings['lxd_address'],
+               settings['hostname'], '%s:8443' % settings['address'],
                '--accept-certificate'], stdin=PIPE)
-    p.communicate(input='%s\n' % settings['lxd_password'])
+    p.communicate(input='%s\n' % settings['password'])
 
 
 def configure_subuid(user):