diff options
| -rw-r--r-- | puppet/services/neutron-server.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/pacemaker/neutron-server.yaml | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml index 6efef618..61af11f9 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 7234c1d9..74234a85 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: @@ -27,5 +31,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 |