Switch to using assess_status
neutron-api was still using the old approach to status assessment, calling the os_set_workload_status function rather than the provided assess_status function in neutron_api_utils. Switch to using assess_status, which also correctly sets the application version for the application. Change-Id: I324f6e77bca96f2bb0aacc286050ee258dd09f77
This commit is contained in:
parent
c4be1ed144
commit
d0ef637a46
@ -53,7 +53,6 @@ from charmhelpers.fetch import (
|
||||
from charmhelpers.contrib.openstack.utils import (
|
||||
config_value_changed,
|
||||
configure_installation_source,
|
||||
set_os_workload_status,
|
||||
git_install_requested,
|
||||
openstack_upgrade_available,
|
||||
os_requires_version,
|
||||
@ -66,7 +65,6 @@ from charmhelpers.contrib.openstack.utils import (
|
||||
from neutron_api_utils import (
|
||||
CLUSTER_RES,
|
||||
NEUTRON_CONF,
|
||||
REQUIRED_INTERFACES,
|
||||
api_port,
|
||||
determine_packages,
|
||||
determine_ports,
|
||||
@ -82,9 +80,9 @@ from neutron_api_utils import (
|
||||
services,
|
||||
setup_ipv6,
|
||||
get_topics,
|
||||
check_optional_relations,
|
||||
additional_install_locations,
|
||||
force_etcd_restart,
|
||||
assess_status,
|
||||
)
|
||||
from neutron_api_context import (
|
||||
get_dvr,
|
||||
@ -679,8 +677,7 @@ def main():
|
||||
hooks.execute(sys.argv)
|
||||
except UnregisteredHookError as e:
|
||||
log('Unknown hook {} - skipping.'.format(e))
|
||||
set_os_workload_status(CONFIGS, REQUIRED_INTERFACES,
|
||||
charm_func=check_optional_relations)
|
||||
assess_status(CONFIGS)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
Loading…
Reference in New Issue
Block a user