From 0f742c7ec93c1d13765e34876b087784fc529477 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Fri, 18 Nov 2016 11:45:57 +0000 Subject: Disable keepalived for HA deployments via t-h-t Currently this is disabled via a conditional in the keepalived profile in puppet-tripleo, but this will be incompatible with the planned composable upgrades implementation. Instead we should disable the service template by mapping to OS::Heat::None, and ensure the haproxy manifest uses the t-h-t generated hiera value keepalived_enabled instead of hard-coding a hiera override in the haproxy template. Change-Id: I85a8b1cca7268506de22adfb3a8ce7faa4f157ef Partial-Bug: #1642936 Depends-On: I90faf51881bd05920067c1e1d82baf5d7586af23 --- environments/puppet-pacemaker.yaml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'environments') diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 8cfbab6d..b8e93f20 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -16,3 +16,6 @@ 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): + + # Services that are disabled for HA deployments with pacemaker + OS::TripleO::Services::Keepalived: OS::Heat::None -- cgit 1.2.3-korg ption value='stable/fraser'>stable/fraser Grokmirror user

summary refs log tree commit diff stats

path: root/config/deploy/os-nosdn-nofeature-ha.yaml

blob: 286b51627b17416da7977373606e78961382c7d9 (plain)