~astara-drivers/charms/trusty/nova-cloud-controller/api-ready-rebase

« back to all changes in this revision

Viewing changes to hooks/nova_cc_hooks.py

  • Committer: David Ames
  • Date: 2015-09-21 23:06:54 UTC
  • mto: This revision was merged to the branch mainline in revision 191.
  • Revision ID: david.ames@canonical.com-20150921230654-n7xk14rgi25yiwcf
Action managed upgrades

Show diffs side-by-side

added added

removed removed

Lines of Context:
182
182
    if git_install_requested():
183
183
        if config_value_changed('openstack-origin-git'):
184
184
            git_install(config('openstack-origin-git'))
185
 
    else:
 
185
    elif not config('action-managed-upgrade'):
186
186
        if openstack_upgrade_available('nova-common'):
187
 
            CONFIGS = do_openstack_upgrade()
 
187
            CONFIGS = do_openstack_upgrade(CONFIGS)
188
188
            [neutron_api_relation_joined(rid=rid, remote_restart=True)
189
189
                for rid in relation_ids('neutron-api')]
190
190
    save_script_rc()