Drop zeromq support
Support for the ZeroMQ messaging driver has bit-rotted over the last few years across the OpenStack charms; drop support for ZMQ inline with deprecation notices issued in 17.02 charm release. Change-Id: I39e464b289c9df842ca73e64c7576ba0531963ae
This commit is contained in:
parent
373158b5cf
commit
0196625084
|
@ -63,7 +63,6 @@ from charmhelpers.contrib.openstack.utils import (
|
||||||
git_install_requested,
|
git_install_requested,
|
||||||
openstack_upgrade_available,
|
openstack_upgrade_available,
|
||||||
os_release,
|
os_release,
|
||||||
os_requires_version,
|
|
||||||
sync_db_with_multi_ipv6_addresses,
|
sync_db_with_multi_ipv6_addresses,
|
||||||
pausable_restart_on_change as restart_on_change,
|
pausable_restart_on_change as restart_on_change,
|
||||||
is_unit_paused_set,
|
is_unit_paused_set,
|
||||||
|
@ -114,7 +113,6 @@ from nova_cc_utils import (
|
||||||
console_attributes,
|
console_attributes,
|
||||||
service_guard,
|
service_guard,
|
||||||
guard_map,
|
guard_map,
|
||||||
get_topics,
|
|
||||||
setup_ipv6,
|
setup_ipv6,
|
||||||
is_db_initialised,
|
is_db_initialised,
|
||||||
assess_status,
|
assess_status,
|
||||||
|
@ -343,8 +341,6 @@ def config_changed():
|
||||||
quantum_joined(rid=rid)
|
quantum_joined(rid=rid)
|
||||||
for r_id in relation_ids('identity-service'):
|
for r_id in relation_ids('identity-service'):
|
||||||
identity_joined(rid=r_id)
|
identity_joined(rid=r_id)
|
||||||
for rid in relation_ids('zeromq-configuration'):
|
|
||||||
zeromq_configuration_relation_joined(rid)
|
|
||||||
[cluster_joined(rid) for rid in relation_ids('cluster')]
|
[cluster_joined(rid) for rid in relation_ids('cluster')]
|
||||||
[compute_joined(rid=rid) for rid in relation_ids('cloud-compute')]
|
[compute_joined(rid=rid) for rid in relation_ids('cloud-compute')]
|
||||||
|
|
||||||
|
@ -1083,14 +1079,6 @@ def neutron_api_relation_broken():
|
||||||
quantum_joined(rid=rid)
|
quantum_joined(rid=rid)
|
||||||
|
|
||||||
|
|
||||||
@hooks.hook('zeromq-configuration-relation-joined')
|
|
||||||
@os_requires_version('kilo', 'nova-common')
|
|
||||||
def zeromq_configuration_relation_joined(relid=None):
|
|
||||||
relation_set(relation_id=relid,
|
|
||||||
topics=" ".join(get_topics()),
|
|
||||||
users="nova")
|
|
||||||
|
|
||||||
|
|
||||||
@hooks.hook('nrpe-external-master-relation-joined',
|
@hooks.hook('nrpe-external-master-relation-joined',
|
||||||
'nrpe-external-master-relation-changed')
|
'nrpe-external-master-relation-changed')
|
||||||
def update_nrpe_config():
|
def update_nrpe_config():
|
||||||
|
|
|
@ -1200,13 +1200,6 @@ def service_guard(guard_map, contexts, active=False):
|
||||||
return wrap
|
return wrap
|
||||||
|
|
||||||
|
|
||||||
def get_topics():
|
|
||||||
topics = ['scheduler', 'conductor']
|
|
||||||
if 'nova-consoleauth' in services():
|
|
||||||
topics.append('consoleauth')
|
|
||||||
return topics
|
|
||||||
|
|
||||||
|
|
||||||
def cmd_all_services(cmd):
|
def cmd_all_services(cmd):
|
||||||
if is_unit_paused_set():
|
if is_unit_paused_set():
|
||||||
log('Unit is in paused state, not issuing {} to all'
|
log('Unit is in paused state, not issuing {} to all'
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
nova_cc_hooks.py
|
|
|
@ -1 +0,0 @@
|
||||||
nova_cc_hooks.py
|
|
|
@ -59,9 +59,6 @@ requires:
|
||||||
scope: container
|
scope: container
|
||||||
memcache:
|
memcache:
|
||||||
interface: memcache
|
interface: memcache
|
||||||
zeromq-configuration:
|
|
||||||
interface: zeromq-configuration
|
|
||||||
scope: container
|
|
||||||
peers:
|
peers:
|
||||||
cluster:
|
cluster:
|
||||||
interface: nova-ha
|
interface: nova-ha
|
||||||
|
|
|
@ -260,7 +260,6 @@ class NovaCCHooksTests(CharmTestCase):
|
||||||
self.git_install_requested.return_value = False
|
self.git_install_requested.return_value = False
|
||||||
self.openstack_upgrade_available.return_value = True
|
self.openstack_upgrade_available.return_value = True
|
||||||
self.relation_ids.return_value = ['generic_rid']
|
self.relation_ids.return_value = ['generic_rid']
|
||||||
_zmq_joined = self.patch('zeromq_configuration_relation_joined')
|
|
||||||
utils_config.side_effect = self.test_config.get
|
utils_config.side_effect = self.test_config.get
|
||||||
self.test_config.set('console-access-protocol', 'dummy')
|
self.test_config.set('console-access-protocol', 'dummy')
|
||||||
mock_relids.return_value = []
|
mock_relids.return_value = []
|
||||||
|
@ -270,7 +269,6 @@ class NovaCCHooksTests(CharmTestCase):
|
||||||
self.assertTrue(self.do_openstack_upgrade.called)
|
self.assertTrue(self.do_openstack_upgrade.called)
|
||||||
self.assertTrue(neutron_api_joined.called)
|
self.assertTrue(neutron_api_joined.called)
|
||||||
self.assertTrue(identity_joined.called)
|
self.assertTrue(identity_joined.called)
|
||||||
self.assertTrue(_zmq_joined.called)
|
|
||||||
self.assertTrue(cluster_joined.called)
|
self.assertTrue(cluster_joined.called)
|
||||||
self.assertTrue(db_joined.called)
|
self.assertTrue(db_joined.called)
|
||||||
self.assertTrue(self.save_script_rc.called)
|
self.assertTrue(self.save_script_rc.called)
|
||||||
|
|
Loading…
Reference in New Issue