From 3fc7da4b577af3d5c00c08a3e044a9cbb5a5e430 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 18 May 2016 19:06:46 +0200 Subject: 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 --- puppet/services/pacemaker/neutron-l3.yaml | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit 1.2.3-korg