diff options
author | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-09-08 11:21:16 +0300 |
---|---|---|
committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-09-10 12:43:59 +0300 |
commit | b1c32247a2d724294e1d9a5e4df6c48c525ed300 (patch) | |
tree | de592f46ccd9a75990c6396e0a787b483b6f908e /puppet/services/pacemaker/nova-vnc-proxy.yaml | |
parent | 6fabca4dafb3fe7f32fb449e406e8616a292ec5e (diff) |
Make Nova VNC Proxy service name match service net map
If these names don't match then we cannot set the service's nodes,
VIP and network.
Change-Id: I8f1c0eaf62eee2704a5f2556a553032106db606b
Closes-Bug: #1621368
Diffstat (limited to 'puppet/services/pacemaker/nova-vnc-proxy.yaml')
-rw-r--r-- | puppet/services/pacemaker/nova-vnc-proxy.yaml | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/puppet/services/pacemaker/nova-vnc-proxy.yaml b/puppet/services/pacemaker/nova-vnc-proxy.yaml new file mode 100644 index 00000000..d0c4f1d0 --- /dev/null +++ b/puppet/services/pacemaker/nova-vnc-proxy.yaml @@ -0,0 +1,43 @@ +heat_template_version: 2016-04-08 + +description: > + OpenStack Nova Vncproxy service with Pacemaker configured with Puppet. + +parameters: + ServiceNetMap: + default: {} + description: Mapping of service_name -> network name. Typically set + via parameter_defaults in the resource registry. This + mapping overrides those in ServiceNetMapDefaults. + type: json + DefaultPasswords: + default: {} + type: json + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + +resources: + + NovaVncproxyBase: + type: ../nova-vnc-proxy.yaml + properties: + ServiceNetMap: {get_param: ServiceNetMap} + DefaultPasswords: {get_param: DefaultPasswords} + EndpointMap: {get_param: EndpointMap} + +outputs: + role_data: + description: Role data for the Nova Vncproxy role. + value: + service_name: nova_vnc_proxy + monitoring_subscription: {get_attr: [NovaVncproxyBase, role_data, monitoring_subscription]} + config_settings: + map_merge: + - get_attr: [NovaVncproxyBase, role_data, config_settings] + - nova::vncproxy::manage_service: false + nova::vncproxy::enabled: false + step_config: | + include ::tripleo::profile::pacemaker::nova::vncproxy |