From 8d0497d819a0f7e75eaae8531218ca7890d8ed7b Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 21 Jul 2016 16:10:37 -0400 Subject: Fixes type and description for NeutronL3HA puppet-neutron takes this variable as boolean. Although it doesn't change the behavior in master (because the variable is used directly as config), in mitaka it is used as a conditional and should be properly fixed. Also a fix is needed in python-tripleoclient because it is hard coded to be True there based on number of controllers being greater than 1. Therefore we shoudl remove that logic from tripleoclient and implement it in THT. In order to do that the pacemaker version of the variable is defaulted to true. Partial-Bug: 1605379 Change-Id: I0b797dbe188382e2dc32506913aaa60a0a21bd68 Signed-off-by: Tim Rozet --- puppet/services/pacemaker/neutron-server.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'puppet/services/pacemaker') diff --git a/puppet/services/pacemaker/neutron-server.yaml b/puppet/services/pacemaker/neutron-server.yaml index 60599e7e..198d6e7f 100644 --- a/puppet/services/pacemaker/neutron-server.yaml +++ b/puppet/services/pacemaker/neutron-server.yaml @@ -9,6 +9,10 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + NeutronL3HA: + default: true + description: Whether to enable HA for virtual routers + type: boolean resources: @@ -26,5 +30,6 @@ outputs: - get_attr: [NeutronServerBase, role_data, config_settings] - neutron::server::enabled: false neutron::server::manage_service: false + neutron::server::l3_ha: {get_param: NeutronL3HA} step_config: | include ::tripleo::profile::pacemaker::neutron::server -- cgit 1.2.3-korg