Add 0mq support
This commit is contained in:
parent
af7e237474
commit
132a1844a3
|
@ -1,4 +1,4 @@
|
||||||
branch: lp:charm-helpers
|
branch: lp:~openstack-charmers/charm-helpers/0mq
|
||||||
destination: hooks/charmhelpers
|
destination: hooks/charmhelpers
|
||||||
include:
|
include:
|
||||||
- core
|
- core
|
||||||
|
|
|
@ -21,6 +21,7 @@ from charmhelpers.core.hookenv import (
|
||||||
relation_get,
|
relation_get,
|
||||||
relation_ids,
|
relation_ids,
|
||||||
related_units,
|
related_units,
|
||||||
|
is_relation_made,
|
||||||
relation_set,
|
relation_set,
|
||||||
unit_get,
|
unit_get,
|
||||||
unit_private_ip,
|
unit_private_ip,
|
||||||
|
@ -787,3 +788,16 @@ class SyslogContext(OSContextGenerator):
|
||||||
'use_syslog': config('use-syslog')
|
'use_syslog': config('use-syslog')
|
||||||
}
|
}
|
||||||
return ctxt
|
return ctxt
|
||||||
|
|
||||||
|
|
||||||
|
class ZeroMQContext(OSContextGenerator):
|
||||||
|
interfaces = ['zeromq-configuration']
|
||||||
|
|
||||||
|
def __call__(self):
|
||||||
|
ctxt = {}
|
||||||
|
if is_relation_made('zeromq-configuration', 'host'):
|
||||||
|
for rid in relation_ids('zeromq-configuration'):
|
||||||
|
for unit in related_units(rid):
|
||||||
|
ctxt['zmq_nonce'] = relation_get('nonce', unit, rid)
|
||||||
|
ctxt['zmq_host'] = relation_get('host', unit, rid)
|
||||||
|
return ctxt
|
|
@ -70,6 +70,7 @@ SWIFT_CODENAMES = OrderedDict([
|
||||||
('1.13.0', 'icehouse'),
|
('1.13.0', 'icehouse'),
|
||||||
('1.12.0', 'icehouse'),
|
('1.12.0', 'icehouse'),
|
||||||
('1.11.0', 'icehouse'),
|
('1.11.0', 'icehouse'),
|
||||||
|
('2.0.0', 'juno'),
|
||||||
])
|
])
|
||||||
|
|
||||||
DEFAULT_LOOPBACK_SIZE = '5G'
|
DEFAULT_LOOPBACK_SIZE = '5G'
|
||||||
|
|
|
@ -156,12 +156,15 @@ def hook_name():
|
||||||
|
|
||||||
|
|
||||||
class Config(dict):
|
class Config(dict):
|
||||||
"""A Juju charm config dictionary that can write itself to
|
"""A dictionary representation of the charm's config.yaml, with some
|
||||||
disk (as json) and track which values have changed since
|
extra features:
|
||||||
the previous hook invocation.
|
|
||||||
|
|
||||||
Do not instantiate this object directly - instead call
|
- See which values in the dictionary have changed since the previous hook.
|
||||||
``hookenv.config()``
|
- For values that have changed, see what the previous value was.
|
||||||
|
- Store arbitrary data for use in a later hook.
|
||||||
|
|
||||||
|
NOTE: Do not instantiate this object directly - instead call
|
||||||
|
``hookenv.config()``, which will return an instance of :class:`Config`.
|
||||||
|
|
||||||
Example usage::
|
Example usage::
|
||||||
|
|
||||||
|
@ -170,8 +173,8 @@ class Config(dict):
|
||||||
>>> config = hookenv.config()
|
>>> config = hookenv.config()
|
||||||
>>> config['foo']
|
>>> config['foo']
|
||||||
'bar'
|
'bar'
|
||||||
|
>>> # store a new key/value for later use
|
||||||
>>> config['mykey'] = 'myval'
|
>>> config['mykey'] = 'myval'
|
||||||
>>> config.save()
|
|
||||||
|
|
||||||
|
|
||||||
>>> # user runs `juju set mycharm foo=baz`
|
>>> # user runs `juju set mycharm foo=baz`
|
||||||
|
@ -188,22 +191,23 @@ class Config(dict):
|
||||||
>>> # keys/values that we add are preserved across hooks
|
>>> # keys/values that we add are preserved across hooks
|
||||||
>>> config['mykey']
|
>>> config['mykey']
|
||||||
'myval'
|
'myval'
|
||||||
>>> # don't forget to save at the end of hook!
|
|
||||||
>>> config.save()
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
CONFIG_FILE_NAME = '.juju-persistent-config'
|
CONFIG_FILE_NAME = '.juju-persistent-config'
|
||||||
|
|
||||||
def __init__(self, *args, **kw):
|
def __init__(self, *args, **kw):
|
||||||
super(Config, self).__init__(*args, **kw)
|
super(Config, self).__init__(*args, **kw)
|
||||||
|
self.implicit_save = True
|
||||||
self._prev_dict = None
|
self._prev_dict = None
|
||||||
self.path = os.path.join(charm_dir(), Config.CONFIG_FILE_NAME)
|
self.path = os.path.join(charm_dir(), Config.CONFIG_FILE_NAME)
|
||||||
if os.path.exists(self.path):
|
if os.path.exists(self.path):
|
||||||
self.load_previous()
|
self.load_previous()
|
||||||
|
|
||||||
def load_previous(self, path=None):
|
def load_previous(self, path=None):
|
||||||
"""Load previous copy of config from disk so that current values
|
"""Load previous copy of config from disk.
|
||||||
can be compared to previous values.
|
|
||||||
|
In normal usage you don't need to call this method directly - it
|
||||||
|
is called automatically at object initialization.
|
||||||
|
|
||||||
:param path:
|
:param path:
|
||||||
|
|
||||||
|
@ -218,8 +222,8 @@ class Config(dict):
|
||||||
self._prev_dict = json.load(f)
|
self._prev_dict = json.load(f)
|
||||||
|
|
||||||
def changed(self, key):
|
def changed(self, key):
|
||||||
"""Return true if the value for this key has changed since
|
"""Return True if the current value for this key is different from
|
||||||
the last save.
|
the previous value.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
if self._prev_dict is None:
|
if self._prev_dict is None:
|
||||||
|
@ -228,7 +232,7 @@ class Config(dict):
|
||||||
|
|
||||||
def previous(self, key):
|
def previous(self, key):
|
||||||
"""Return previous value for this key, or None if there
|
"""Return previous value for this key, or None if there
|
||||||
is no "previous" value.
|
is no previous value.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
if self._prev_dict:
|
if self._prev_dict:
|
||||||
|
@ -238,7 +242,13 @@ class Config(dict):
|
||||||
def save(self):
|
def save(self):
|
||||||
"""Save this config to disk.
|
"""Save this config to disk.
|
||||||
|
|
||||||
Preserves items in _prev_dict that do not exist in self.
|
If the charm is using the :mod:`Services Framework <services.base>`
|
||||||
|
or :meth:'@hook <Hooks.hook>' decorator, this
|
||||||
|
is called automatically at the end of successful hook execution.
|
||||||
|
Otherwise, it should be called directly by user code.
|
||||||
|
|
||||||
|
To disable automatic saves, set ``implicit_save=False`` on this
|
||||||
|
instance.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
if self._prev_dict:
|
if self._prev_dict:
|
||||||
|
@ -478,6 +488,9 @@ class Hooks(object):
|
||||||
hook_name = os.path.basename(args[0])
|
hook_name = os.path.basename(args[0])
|
||||||
if hook_name in self._hooks:
|
if hook_name in self._hooks:
|
||||||
self._hooks[hook_name]()
|
self._hooks[hook_name]()
|
||||||
|
cfg = config()
|
||||||
|
if cfg.implicit_save:
|
||||||
|
cfg.save()
|
||||||
else:
|
else:
|
||||||
raise UnregisteredHookError(hook_name)
|
raise UnregisteredHookError(hook_name)
|
||||||
|
|
||||||
|
|
|
@ -118,6 +118,9 @@ class ServiceManager(object):
|
||||||
else:
|
else:
|
||||||
self.provide_data()
|
self.provide_data()
|
||||||
self.reconfigure_services()
|
self.reconfigure_services()
|
||||||
|
cfg = hookenv.config()
|
||||||
|
if cfg.implicit_save:
|
||||||
|
cfg.save()
|
||||||
|
|
||||||
def provide_data(self):
|
def provide_data(self):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -59,6 +59,7 @@ from nova_cc_utils import (
|
||||||
migrate_database,
|
migrate_database,
|
||||||
neutron_plugin,
|
neutron_plugin,
|
||||||
save_script_rc,
|
save_script_rc,
|
||||||
|
services,
|
||||||
ssh_compute_add,
|
ssh_compute_add,
|
||||||
ssh_compute_remove,
|
ssh_compute_remove,
|
||||||
ssh_known_hosts_lines,
|
ssh_known_hosts_lines,
|
||||||
|
@ -74,6 +75,7 @@ from nova_cc_utils import (
|
||||||
console_attributes,
|
console_attributes,
|
||||||
service_guard,
|
service_guard,
|
||||||
guard_map,
|
guard_map,
|
||||||
|
get_topics,
|
||||||
)
|
)
|
||||||
|
|
||||||
from charmhelpers.contrib.hahelpers.cluster import (
|
from charmhelpers.contrib.hahelpers.cluster import (
|
||||||
|
@ -132,7 +134,8 @@ def config_changed():
|
||||||
for rid in relation_ids('cloud-compute')]
|
for rid in relation_ids('cloud-compute')]
|
||||||
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)
|
||||||
|
|
||||||
@hooks.hook('amqp-relation-joined')
|
@hooks.hook('amqp-relation-joined')
|
||||||
def amqp_joined(relation_id=None):
|
def amqp_joined(relation_id=None):
|
||||||
|
@ -698,6 +701,19 @@ def neutron_api_relation_broken():
|
||||||
quantum_joined(rid=rid)
|
quantum_joined(rid=rid)
|
||||||
|
|
||||||
|
|
||||||
|
@hooks.hook('zeromq-configuration-relation-joined')
|
||||||
|
def zeromq_configuration_relation_joined(relid=None):
|
||||||
|
relation_set(relation_id=relid,
|
||||||
|
topics=" ".join(get_topics()),
|
||||||
|
users="nova")
|
||||||
|
|
||||||
|
|
||||||
|
@hooks.hook('zeromq-configuration-relation-changed')
|
||||||
|
@restart_on_change(restart_map(), stopstart=True)
|
||||||
|
def zeromq_configuration_relation_changed():
|
||||||
|
CONFIGS.write(NOVA_CONF)
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
try:
|
try:
|
||||||
hooks.execute(sys.argv)
|
hooks.execute(sys.argv)
|
||||||
|
|
|
@ -108,7 +108,8 @@ BASE_RESOURCE_MAP = OrderedDict([
|
||||||
context.SyslogContext(),
|
context.SyslogContext(),
|
||||||
nova_cc_context.HAProxyContext(),
|
nova_cc_context.HAProxyContext(),
|
||||||
nova_cc_context.IdentityServiceContext(),
|
nova_cc_context.IdentityServiceContext(),
|
||||||
nova_cc_context.VolumeServiceContext()],
|
nova_cc_context.VolumeServiceContext(),
|
||||||
|
context.ZeroMQContext()],
|
||||||
}),
|
}),
|
||||||
(NOVA_API_PASTE, {
|
(NOVA_API_PASTE, {
|
||||||
'services': [s for s in BASE_SERVICES if 'api' in s],
|
'services': [s for s in BASE_SERVICES if 'api' in s],
|
||||||
|
@ -859,3 +860,10 @@ def service_guard(guard_map, contexts, active=False):
|
||||||
f(*args)
|
f(*args)
|
||||||
return wrapped_f
|
return wrapped_f
|
||||||
return wrap
|
return wrap
|
||||||
|
|
||||||
|
|
||||||
|
def get_topics():
|
||||||
|
topics = ['scheduler']
|
||||||
|
if 'nova-consoleauth' in services():
|
||||||
|
topics.append('consoleauth')
|
||||||
|
return topics
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
nova_cc_hooks.py
|
|
@ -0,0 +1 @@
|
||||||
|
nova_cc_hooks.py
|
|
@ -38,6 +38,9 @@ requires:
|
||||||
nova-vmware:
|
nova-vmware:
|
||||||
interface: nova-vmware
|
interface: nova-vmware
|
||||||
scope: container
|
scope: container
|
||||||
|
zeromq-configuration:
|
||||||
|
interface: zeromq-configuration
|
||||||
|
scope: container
|
||||||
peers:
|
peers:
|
||||||
cluster:
|
cluster:
|
||||||
interface: nova-ha
|
interface: nova-ha
|
||||||
|
|
|
@ -30,6 +30,8 @@ keystone_ec2_url = {{ keystone_ec2_url }}
|
||||||
|
|
||||||
{% include "parts/rabbitmq" %}
|
{% include "parts/rabbitmq" %}
|
||||||
|
|
||||||
|
{% include "parts/zeromq" %}
|
||||||
|
|
||||||
{% if glance_api_servers -%}
|
{% if glance_api_servers -%}
|
||||||
glance_api_servers = {{ glance_api_servers }}
|
glance_api_servers = {{ glance_api_servers }}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{% if zmq_host -%}
|
||||||
|
# ZeroMQ configuration (restart-nonce: {{ zmq_nonce }})
|
||||||
|
rpc_backend = zmq
|
||||||
|
rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_ring.MatchMakerRing
|
||||||
|
rpc_zmq_host = {{ zmq_host }}
|
||||||
|
{% endif -%}
|
Loading…
Reference in New Issue