Merge "Ensure we write nova configs after lxd relation is ready"

This commit is contained in:
Jenkins 2017-06-07 10:11:27 +00:00 committed by Gerrit Code Review
commit 0bc5be8a1d
1 changed files with 2 additions and 2 deletions

View File

@ -525,14 +525,14 @@ def lxd_joined(relid=None):
@hooks.hook('lxd-relation-changed')
@restart_on_change(restart_map())
def lxc_changed():
nonce = relation_get('nonce')
db = kv()
if nonce and db.get('lxd-nonce') != nonce:
db.set('lxd-nonce', nonce)
configure_lxd(user='nova')
if not is_unit_paused_set():
service_restart('nova-compute')
CONFIGS.write(NOVA_CONF)
@hooks.hook('nova-designate-relation-changed')