Deprecate nova-api-metadata nrpe check
This change adds nova-api-metadata to the list of deprecated services for NRPE checks. That will be happen if disable_nova_metadata() is set to True. Added an update to NRPE checks to quantum-network -service changed hook, since its change defines if nova-api-metadata should be deprecated. Change-Id: I6b1174561f3dad3ec5334f1e38e45c068a0107a8 Closes-Bug: #1812813
This commit is contained in:
parent
70b67e0c84
commit
775c06f8ff
@ -268,6 +268,8 @@ def nm_changed():
|
||||
service_restart('nova-api-metadata')
|
||||
db.set('restart_nonce', restart_nonce)
|
||||
db.flush()
|
||||
# LP: #1812813
|
||||
update_nrpe_config()
|
||||
|
||||
|
||||
@hooks.hook("cluster-relation-departed")
|
||||
|
@ -1124,7 +1124,10 @@ def configure_apparmor():
|
||||
def deprecated_services():
|
||||
''' Returns a list of deprecated services with this charm '''
|
||||
cmp_release = CompareOpenStackReleases(os_release('neutron-common'))
|
||||
services = []
|
||||
if disable_nova_metadata():
|
||||
services.append('nova-api-metadata')
|
||||
if cmp_release >= 'train':
|
||||
return ['neutron-lbaasv2-agent']
|
||||
services.append('neutron-lbaasv2-agent')
|
||||
|
||||
return []
|
||||
return services
|
||||
|
@ -1067,3 +1067,11 @@ class TestNeutronAgentReallocation(CharmTestCase):
|
||||
context.AppArmorContext.assert_any_call(
|
||||
neutron_utils.NEUTRON_LBAASV2_AA_PROFILE
|
||||
)
|
||||
|
||||
@patch.object(neutron_utils, 'disable_nova_metadata')
|
||||
def test_deprecated_services(self, disable_nova_metadata):
|
||||
self.os_release.return_value = 'train'
|
||||
disable_nova_metadata.return_value = True
|
||||
self.assertEqual(neutron_utils.deprecated_services(),
|
||||
['nova-api-metadata',
|
||||
'neutron-lbaasv2-agent'])
|
||||
|
Loading…
x
Reference in New Issue
Block a user