summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-28 07:26:39 +0000
committerGerrit Code Review <review@openstack.org>2016-09-28 07:26:39 +0000
commit7c39f66d1c7a68d46e9cc116e8985b9d1650afb9 (patch)
tree8cc09ea7fad96c3743e0c54fbfc7b4f719d8f645 /puppet
parent8b38376787cad1dfb6a6142b581ca4229827ae71 (diff)
parent7ca775728d998bada32ec669d6d14d09527171e3 (diff)
Merge "Deprecate the NeutronL3HA parameter"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/neutron-api.yaml30
1 files changed, 23 insertions, 7 deletions
diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml
index 8cfa20bd..dca82bc0 100644
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@@ -37,13 +37,6 @@ parameters:
default: 'True'
description: Allow automatic l3-agent failover
type: string
- NeutronL3HA:
- default: false
- description: |
- Whether to enable HA for virtual routers. While the default value is
- 'false', L3 HA will be automatically enabled if the number of nodes hosting
- controller configurations and DVR is disabled.
- type: boolean
NovaPassword:
description: The password for the nova service and db account, used by nova-api.
type: string
@@ -72,6 +65,29 @@ parameters:
default: 1
type: number
+ # DEPRECATED: the following options are deprecated and are currently maintained
+ # for backwards compatibility. They will be removed in the Ocata cycle.
+ NeutronL3HA:
+ default: false
+ description: |
+ Whether to enable HA for virtual routers. While the default value is
+ 'false', L3 HA will be automatically enabled if the number of nodes
+ hosting controller configurations and DVR is disabled. This parameter is
+ being deprecated in Newton and is scheduled to be removed in Ocata.
+ Future releases will enable L3 HA by default if it is appropriate for the
+ deployment type. Alternate mechanisms will be available to override.
+ type: boolean
+
+parameter_groups:
+- label: deprecated
+ description: |
+ The following parameters are deprecated and will be removed. They should not
+ be relied on for new deployments. If you have concerns regarding deprecated
+ parameters, please contact the TripleO development team on IRC or the
+ OpenStack mailing list.
+ parameters:
+ - NeutronL3HA
+
resources:
NeutronBase: