diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-12 07:28:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-12 07:28:20 +0000 |
| commit | 692e9e6a7c0a661763c716837cdf4e6c4a182fdb (patch) | |
| tree | 001932812ed6e4f9776a198ec0c2ca15d7ab66a7 /puppet/services | |
| parent | dfe74b211267cde7a1da4e1fe9430127eda234c6 (diff) | |
| parent | b1c32247a2d724294e1d9a5e4df6c48c525ed300 (diff) | |
Merge "Make Nova VNC Proxy service name match service net map"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/nova-vnc-proxy.yaml (renamed from puppet/services/nova-vncproxy.yaml) | 2 | ||||
| -rw-r--r-- | puppet/services/pacemaker/nova-vnc-proxy.yaml (renamed from puppet/services/pacemaker/nova-vncproxy.yaml) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/puppet/services/nova-vncproxy.yaml b/puppet/services/nova-vnc-proxy.yaml index ce15fccc..179112d3 100644 --- a/puppet/services/nova-vncproxy.yaml +++ b/puppet/services/nova-vnc-proxy.yaml @@ -34,7 +34,7 @@ outputs: role_data: description: Role data for the Nova Vncproxy service. value: - service_name: nova_vncproxy + service_name: nova_vnc_proxy monitoring_subscription: {get_param: MonitoringSubscriptionNovaVNCProxy} config_settings: map_merge: diff --git a/puppet/services/pacemaker/nova-vncproxy.yaml b/puppet/services/pacemaker/nova-vnc-proxy.yaml index 0ec5de68..d0c4f1d0 100644 --- a/puppet/services/pacemaker/nova-vncproxy.yaml +++ b/puppet/services/pacemaker/nova-vnc-proxy.yaml @@ -22,7 +22,7 @@ parameters: resources: NovaVncproxyBase: - type: ../nova-vncproxy.yaml + type: ../nova-vnc-proxy.yaml properties: ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} @@ -32,7 +32,7 @@ outputs: role_data: description: Role data for the Nova Vncproxy role. value: - service_name: nova_vncproxy + service_name: nova_vnc_proxy monitoring_subscription: {get_attr: [NovaVncproxyBase, role_data, monitoring_subscription]} config_settings: map_merge: |