From 0681179aa30ce3b94c1cfe72e92474830642ce15 Mon Sep 17 00:00:00 2001 From: David Ames Date: Wed, 6 Sep 2017 15:56:27 -0700 Subject: [PATCH] Reset os_release after an upgrade determine_endpoints was failing to recognize the new OS release after an upgrade. Specifically newton --> ocata failed to register the placement api. Reset os_release after an upgrade. Change-Id: I04ae30aea435c8c39f58d1a814d070a057bb5ce0 Closes-Bug: #1715505 --- hooks/nova_cc_hooks.py | 2 +- hooks/nova_cc_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/nova_cc_hooks.py b/hooks/nova_cc_hooks.py index cdcbca7e..a2e874b7 100755 --- a/hooks/nova_cc_hooks.py +++ b/hooks/nova_cc_hooks.py @@ -315,7 +315,7 @@ def config_changed(): elif not config('action-managed-upgrade'): if openstack_upgrade_available('nova-common'): status_set('maintenance', 'Running openstack upgrade') - CONFIGS = do_openstack_upgrade(CONFIGS) + do_openstack_upgrade(CONFIGS) [neutron_api_relation_joined(rid=rid, remote_restart=True) for rid in relation_ids('neutron-api')] # NOTE(jamespage): Force re-fire of shared-db joined hook diff --git a/hooks/nova_cc_utils.py b/hooks/nova_cc_utils.py index 3f09fe6d..494771cd 100644 --- a/hooks/nova_cc_utils.py +++ b/hooks/nova_cc_utils.py @@ -1023,7 +1023,7 @@ def determine_endpoints(public_url, internal_url, admin_url): '''Generates a dictionary containing all relevant endpoints to be passed to keystone as relation settings.''' region = config('region') - os_rel = os_release('nova-common') + os_rel = os_release('nova-common', reset_cache=True) cmp_os_rel = CompareOpenStackReleases(os_rel) nova_public_url = ('%s:%s/v2/$(tenant_id)s' %