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

Proposed by Michał Sawicz on 2015-07-28
Status: Needs review
Proposed branch: lp:~saviq/charms/trusty/nova-compute/lxd-no-redundant
Merge into: lp:~zulcss/charms/trusty/nova-compute/nova-compute-lxd
Diff against target: 20 lines (+3/-3)
1 file modified
hooks/nova_compute_utils.py (+3/-3)
To merge this branch: bzr merge lp:~saviq/charms/trusty/nova-compute/lxd-no-redundant
Reviewer Review Type Date Requested Status
Chuck Short 2015-07-28 Pending
Review via email: mp+266089@code.launchpad.net

Commit message

Drop redundant lxd_ prefixes in lxd relation data

To post a comment you must log in.
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nova_compute_utils.py'
2--- hooks/nova_compute_utils.py 2015-07-24 02:24:48 +0000
3+++ hooks/nova_compute_utils.py 2015-07-28 14:45:19 +0000
4@@ -615,13 +615,13 @@
5 @retry_on_exception(5, base_delay=2, exc_type=CalledProcessError)
6 def configure_lxd_host(settings, user):
7 cmd = ['sudo', '-u', user, 'lxc', 'config', 'set',
8- 'core.trust_password', settings['lxd_password']]
9+ 'core.trust_password', settings['password']]
10 check_call(cmd)
11
12 p = Popen(['sudo', '-u', user, 'lxc', 'remote', 'add',
13- settings['lxd_hostname'], '%s:8443' % settings['lxd_address'],
14+ settings['hostname'], '%s:8443' % settings['address'],
15 '--accept-certificate'], stdin=PIPE)
16- p.communicate(input='%s\n' % settings['lxd_password'])
17+ p.communicate(input='%s\n' % settings['password'])
18
19
20 def configure_subuid(user):

Subscribers

People subscribed via source and target branches

to all changes: