Removes EnableODL heat parameter and fixes missing local_ip param

[apex-tripleo-heat-templates.git] / environments / puppet-pacemaker.yaml

diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index fbba187..8cfbab6 100644 (file)
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -9,7 +9,6 @@ resource_registry:
   # custom pacemaker services
   # NOTE: Please before adding any pacemaker-managed services, get in touch
   # with bandini, Ng or beekhof
-  OS::TripleO::Services::CinderBackup: ../puppet/services/pacemaker/cinder-backup.yaml
   OS::TripleO::Services::CinderVolume: ../puppet/services/pacemaker/cinder-volume.yaml
   OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml
   OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml
@@ -17,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