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

Fix base service type inheriting gnocchi service templates

Change-Id: I5018e4cdb1e5df7c2d67a8c1248d7453941b725f
---

diff --git a/puppet/services/pacemaker/gnocchi-api.yaml b/puppet/services/pacemaker/gnocchi-api.yaml
index 50bd3fa7..42c7131d 100644
--- a/puppet/services/pacemaker/gnocchi-api.yaml
+++ b/puppet/services/pacemaker/gnocchi-api.yaml
@@ -21,7 +21,7 @@ parameters:
 
 resources:
   GnocchiServiceBase:
-    type: ../gnocchi-base.yaml
+    type: ../gnocchi-api.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
diff --git a/puppet/services/pacemaker/gnocchi-metricd.yaml b/puppet/services/pacemaker/gnocchi-metricd.yaml
index 0a6b03ea..177d7744 100644
--- a/puppet/services/pacemaker/gnocchi-metricd.yaml
+++ b/puppet/services/pacemaker/gnocchi-metricd.yaml
@@ -21,7 +21,7 @@ parameters:
 
 resources:
   GnocchiServiceBase:
-    type: ../gnocchi-base.yaml
+    type: ../gnocchi-metricd.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
diff --git a/puppet/services/pacemaker/gnocchi-statsd.yaml b/puppet/services/pacemaker/gnocchi-statsd.yaml
index 12256d32..a247a514 100644
--- a/puppet/services/pacemaker/gnocchi-statsd.yaml
+++ b/puppet/services/pacemaker/gnocchi-statsd.yaml
@@ -21,7 +21,7 @@ parameters:
 
 resources:
   GnocchiServiceBase:
-    type: ../gnocchi-base.yaml
+    type: ../gnocchi-statsd.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}