diff options
Diffstat (limited to 'puppet/controller-puppet.yaml')
| -rw-r--r-- | puppet/controller-puppet.yaml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index a2377db3..295cb328 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -242,6 +242,10 @@ parameters: type: string default: '' description: If set, flat networks to configure in neutron plugins. + NeutronL3HA: + default: 'False' + description: Whether to enable l3-agent HA + type: string NeutronNetworkType: default: 'gre' description: The tenant network type for Neutron, either gre or vxlan. @@ -516,6 +520,7 @@ resources: neutron_router_distributed: {get_param: NeutronDVR} neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers} neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover} + neutron_l3_ha: {get_param: NeutronL3HA} neutron_network_vlan_ranges: {get_param: NeutronNetworkVLANRanges} neutron_bridge_mappings: {get_param: NeutronBridgeMappings} neutron_public_interface: {get_param: NeutronPublicInterface} @@ -599,10 +604,10 @@ resources: - controller - object - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig - - rabbit # provided by allNodesConfig - ceph_cluster # provided by CephClusterConfig - ceph - bootstrap_node # provided by BootstrapNodeConfig + - all_nodes # provided by allNodesConfig - common datafiles: common: @@ -705,7 +710,7 @@ resources: # MySQL admin_password: {get_input: admin_password} mysql_innodb_buffer_pool_size: {get_input: mysql_innodb_buffer_pool_size} - mysql_root_password: {get_input: mysql_root_password} + mysql::server::root_password: {get_input: mysql_root_password} mysql_cluster_name: {get_input: mysql_cluster_name} # Neutron neutron::bind_host: {get_input: controller_host} @@ -727,6 +732,7 @@ resources: neutron_router_distributed: {get_input: neutron_router_distributed} neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers} neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover} + neutron::server::l3_ha: {get_input: neutron_l3_ha} neutron::plugins::ml2::network_vlan_ranges: {get_input: neutron_network_vlan_ranges} neutron_bridge_mappings: {get_input: neutron_bridge_mappings} neutron_public_interface: {get_input: neutron_public_interface} @@ -779,7 +785,6 @@ resources: controller_virtual_ip: {get_input: controller_virtual_ip} public_virtual_interface: {get_input: public_virtual_interface} public_virtual_ip: {get_input: public_virtual_ip} - tripleo::loadbalancer::controller_host: {get_input: controller_host} tripleo::loadbalancer::control_virtual_interface: {get_input: control_virtual_interface} tripleo::loadbalancer::controller_virtual_ip: {get_input: controller_virtual_ip} tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface} |