From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Thu, 25 Aug 2016 18:37:32 +0000 (-0400)
Subject: Fix base service type inheriting ceilometer service pcmk templates
X-Git-Tag: opnfv-6.0.0~1699^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=aae669aa179cf59c9e14859a3ddcc20c26582054;p=apex-tripleo-heat-templates.git

Fix base service type inheriting ceilometer service pcmk templates

Change-Id: Id2227bedee098e0f18704a3dc82fb0be311ff4d2
---

diff --git a/puppet/services/pacemaker/ceilometer-agent-central.yaml b/puppet/services/pacemaker/ceilometer-agent-central.yaml
index ac4bdcf0..78714878 100644
--- a/puppet/services/pacemaker/ceilometer-agent-central.yaml
+++ b/puppet/services/pacemaker/ceilometer-agent-central.yaml
@@ -21,7 +21,7 @@ parameters:
 
 resources:
   CeilometerServiceBase:
-    type: ../ceilometer-base.yaml
+    type: ../ceilometer-agent-central.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
diff --git a/puppet/services/pacemaker/ceilometer-agent-notification.yaml b/puppet/services/pacemaker/ceilometer-agent-notification.yaml
index 112dde1c..6290203a 100644
--- a/puppet/services/pacemaker/ceilometer-agent-notification.yaml
+++ b/puppet/services/pacemaker/ceilometer-agent-notification.yaml
@@ -21,7 +21,7 @@ parameters:
 
 resources:
   CeilometerServiceBase:
-    type: ../ceilometer-base.yaml
+    type: ../ceilometer-agent-notification.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
diff --git a/puppet/services/pacemaker/ceilometer-api.yaml b/puppet/services/pacemaker/ceilometer-api.yaml
index f50e4a15..d130a4bb 100644
--- a/puppet/services/pacemaker/ceilometer-api.yaml
+++ b/puppet/services/pacemaker/ceilometer-api.yaml
@@ -21,7 +21,7 @@ parameters:
 
 resources:
   CeilometerServiceBase:
-    type: ../ceilometer-base.yaml
+    type: ../ceilometer-api.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
diff --git a/puppet/services/pacemaker/ceilometer-collector.yaml b/puppet/services/pacemaker/ceilometer-collector.yaml
index 8d4348db..97da92e8 100644
--- a/puppet/services/pacemaker/ceilometer-collector.yaml
+++ b/puppet/services/pacemaker/ceilometer-collector.yaml
@@ -21,7 +21,7 @@ parameters:
 
 resources:
   CeilometerServiceBase:
-    type: ../ceilometer-base.yaml
+    type: ../ceilometer-collector.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}