summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-07-21 16:10:37 -0400
committerTim Rozet <trozet@redhat.com>2016-07-21 16:31:27 -0400
commit8d0497d819a0f7e75eaae8531218ca7890d8ed7b (patch)
tree77d07e4e1fcb041eb45fdff4fad38278a75129c0
parent393db0231fa4b3b61b65c0ac6f031950e415d58d (diff)
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 <trozet@redhat.com>
-rw-r--r--puppet/services/neutron-server.yaml6
-rw-r--r--puppet/services/pacemaker/neutron-server.yaml5
2 files changed, 8 insertions, 3 deletions
diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml
index d759d420..741b2800 100644
--- a/puppet/services/neutron-server.yaml
+++ b/puppet/services/neutron-server.yaml
@@ -22,9 +22,9 @@ parameters:
description: Allow automatic l3-agent failover
type: string
NeutronL3HA:
- default: 'False'
- description: Whether to enable l3-agent HA
- type: string
+ default: false
+ description: Whether to enable HA for virtual routers
+ type: boolean
NovaPassword:
description: The password for the nova service and db account, used by nova-api.
type: string
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