From b1c32247a2d724294e1d9a5e4df6c48c525ed300 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 8 Sep 2016 11:21:16 +0300
Subject: 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
---
 puppet/services/pacemaker/nova-vnc-proxy.yaml | 43 +++++++++++++++++++++++++++
 puppet/services/pacemaker/nova-vncproxy.yaml  | 43 ---------------------------
 2 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 puppet/services/pacemaker/nova-vnc-proxy.yaml
 delete mode 100644 puppet/services/pacemaker/nova-vncproxy.yaml

(limited to 'puppet/services/pacemaker')

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
diff --git a/puppet/services/pacemaker/nova-vncproxy.yaml b/puppet/services/pacemaker/nova-vncproxy.yaml
deleted file mode 100644
index 0ec5de68..00000000
--- a/puppet/services/pacemaker/nova-vncproxy.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-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-vncproxy.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_vncproxy
-      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
-- 
cgit 1.2.3-korg