Merge trunk.
This commit is contained in:
commit
f0d2584389
1
hooks/nova-vmware-relation-changed
Symbolic link
1
hooks/nova-vmware-relation-changed
Symbolic link
@ -0,0 +1 @@
|
||||
nova_cc_hooks.py
|
1
hooks/nova-vmware-relation-joined
Symbolic link
1
hooks/nova-vmware-relation-joined
Symbolic link
@ -0,0 +1 @@
|
||||
nova_cc_hooks.py
|
@ -396,6 +396,17 @@ def configure_https():
|
||||
identity_joined(rid=rid)
|
||||
|
||||
|
||||
@hooks.hook()
|
||||
def nova_vmware_relation_joined():
|
||||
relation_set(network_manager=network_manager())
|
||||
|
||||
|
||||
@hooks.hook('nova-vmware-relation-changed')
|
||||
@restart_on_change(restart_map())
|
||||
def nova_vmware_relation_changed():
|
||||
CONFIGS.write('/etc/nova/nova.conf')
|
||||
|
||||
|
||||
def main():
|
||||
try:
|
||||
hooks.execute(sys.argv)
|
||||
|
@ -84,6 +84,11 @@ BASE_RESOURCE_MAP = OrderedDict([
|
||||
context.SharedDBContext(relation_prefix='nova'),
|
||||
context.ImageServiceContext(),
|
||||
context.OSConfigFlagContext(),
|
||||
context.SubordinateConfigContext(
|
||||
interface='nova-vmware',
|
||||
service='nova',
|
||||
config_file=NOVA_CONF,
|
||||
),
|
||||
nova_cc_context.HAProxyContext(),
|
||||
nova_cc_context.IdentityServiceContext(),
|
||||
nova_cc_context.VolumeServiceContext(),
|
||||
|
@ -29,6 +29,9 @@ requires:
|
||||
ha:
|
||||
interface: hacluster
|
||||
scope: container
|
||||
nova-vmware:
|
||||
interface: nova-vmware
|
||||
scope: container
|
||||
peers:
|
||||
cluster:
|
||||
interface: nova-ha
|
||||
|
2
revision
2
revision
@ -1 +1 @@
|
||||
305
|
||||
306
|
||||
|
@ -90,3 +90,9 @@ volume_api_class=nova.volume.cinder.API
|
||||
{{ key }} = {{ value }}
|
||||
{% endfor -%}
|
||||
{% endif -%}
|
||||
|
||||
{% if sections and 'DEFAULT' in sections -%}
|
||||
{% for key, value in sections['DEFAULT'] -%}
|
||||
{{ key }} = {{ value }}
|
||||
{% endfor -%}
|
||||
{% endif -%}
|
||||
|
Loading…
x
Reference in New Issue
Block a user