From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 18 Jul 2016 14:34:46 +0000 (-0400)
Subject: Don't collect gnocchi-service tag in THT
X-Git-Tag: opnfv-6.0.0~1841^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9a36561f025f4e0dedde864ddac50273a97676d6;p=apex-tripleo-heat-templates.git

Don't collect gnocchi-service tag in THT

The gnocchi-service tag is already collected in puppet-tripleo Pacemaker
Gnocchi profile and was not removed here.

Change-Id: Ic38aeae849d16db36663f16156d1c9fbcf86784a
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 7b9330d0..3dfaff7c 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -15,8 +15,7 @@
 
 # TODO(jistr): use pcs resource provider instead of just no-ops
 Service <|
-  tag == 'aodh-service' or
-  tag == 'gnocchi-service'
+  tag == 'aodh-service'
 |> {
   hasrestart => true,
   restart    => '/bin/true',