From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 18 May 2016 17:06:46 +0000 (+0200)
Subject: Pass enabled and manage_service to Neutron/L3 when Pacemaker
X-Git-Tag: opnfv-6.0.0~1975^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3fc7da4b577af3d5c00c08a3e044a9cbb5a5e430;p=apex-tripleo-heat-templates.git

Pass enabled and manage_service to Neutron/L3 when Pacemaker

We can drive enabled and manage_service from the Pacemaker specific
templates so change I8ef7bb94e048b998712b3534ceb51a7d10d016e9
removed that logic from the TripleO specific manifests. This change
adds them into the Pacemaker template for the Neutron/L3 agent.

Change-Id: I1146a8bae4938577e9927d1ce74009e066cb58dd
---

diff --git a/puppet/services/pacemaker/neutron-l3.yaml b/puppet/services/pacemaker/neutron-l3.yaml
index 84bff808..cbe2ddbe 100644
--- a/puppet/services/pacemaker/neutron-l3.yaml
+++ b/puppet/services/pacemaker/neutron-l3.yaml
@@ -29,5 +29,7 @@ outputs:
         map_merge:
           - get_attr: [NeutronL3Base, role_data, config_settings]
           - tripleo::profile::pacemaker::neutron::enable_l3: True
+            neutron::agents::l3::enabled: false
+            neutron::agents::l3::manage_service: false
       step_config: |
         include ::tripleo::profile::pacemaker::neutron::l3