summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-19 14:19:58 +0000
committerGerrit Code Review <review@openstack.org>2016-08-19 14:19:58 +0000
commitfab494ed4a89bd7c9fa6207b791922d522cf5cae (patch)
tree802cabec95b2be63d75b64b2b49fedf64bc76e3a
parent9b739012b71e2833e59e94cbe423cda77405c6cb (diff)
parentccc0079965daf2584b389f3610c67f8b694d6bf0 (diff)
Merge "Remove OS::Tripleo::Services::ManilaShare: from puppet-pacemaker.yaml"
-rw-r--r--environments/puppet-pacemaker.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 41f1f1dc..8cfbab6d 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -16,4 +16,3 @@ resource_registry:
OS::TripleO::Services::Redis: ../puppet/services/pacemaker/database/redis.yaml
OS::TripleO::Services::MySQL: ../puppet/services/pacemaker/database/mysql.yaml
# Services that are disabled by default (use relevant environment files):
- OS::Tripleo::Services::ManilaShare: OS::Heat::None