openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add parameter to manage usage of Neutron l3_ha option"

Browse Source
This commit is contained in:
Jenkins 2015-01-27 10:03:34 +00:00 committed by Gerrit Code Review
commit c0328095f1
9 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compute-config-puppet.yaml
View File

@ -91,7 +91,7 @@ resources:
neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers}
neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
neutron_allow_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
neutron_l3_ha: {get_input: neutron_l3_ha}
neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
admin_password: {get_input: admin_password}
nova::rabbit_host: {get_input: rabbit_host}

1
compute-config.yaml
View File

@ -50,6 +50,7 @@ resources:
metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
mechanism_drivers: {get_input: neutron_mechanism_drivers}
allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
l3_ha: {get_input: neutron_l3_ha}
ovs:
local_ip: {get_input: neutron_local_ip}
tenant_network_type: {get_input: neutron_tenant_network_type}

5
compute.yaml
View File

@ -172,6 +172,10 @@ parameters:
default: 'True'
description: Allow automatic l3-agent failover
type: string
NeutronL3HA:
default: 'False'
description: Whether to enable l3-agent HA
type: string
NeutronAgentMode:
default: 'dvr_snat'
description: Agent mode for the neutron-l3-agent on the controller hosts
@ -297,6 +301,7 @@ resources:
neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers}
neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
neutron_l3_ha: {get_param: NeutronL3HA}
neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice}
admin_password: {get_param: AdminPassword}
rabbit_host: {get_param: RabbitHost}

1
controller-config.yaml
View File

@ -87,6 +87,7 @@ resources:
router_distributed: {get_input: neutron_router_distributed}
mechanism_drivers: {get_input: neutron_mechanism_drivers}
allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
l3_ha: {get_input: neutron_l3_ha}
ovs:
enable_tunneling: {get_input: neutron_enable_tunneling}
local_ip: {get_input: controller_host}

4
controller.yaml
View File

@ -220,6 +220,10 @@ parameters:
default: 'True'
description: Allow automatic l3-agent failover
type: string
NeutronL3HA:
default: 'False'
description: Whether to enable l3-agent HA
type: string
NeutronEnableTunnelling:
type: string
default: "True"

1
nova-compute-config.yaml
View File

@ -37,6 +37,7 @@ resources:
metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
mechanism_drivers: {get_input: neutron_mechanism_drivers}
allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
l3_ha: {get_input: neutron_l3_ha}
ovs:
local_ip: {get_input: neutron_local_ip}
tenant_network_type: {get_input: neutron_tenant_network_type}

5
nova-compute-instance.yaml
View File

@ -135,6 +135,10 @@ parameters:
default: 'True'
description: Allow automatic l3-agent failover
type: string
NeutronL3HA:
default: 'False'
description: Whether to enable l3-agent HA
type: string
NovaApiHost:
type: string
NovaComputeDriver:
@ -234,6 +238,7 @@ resources:
neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers}
neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
neutron_l3_ha: {get_param: NeutronL3HA}
admin_password: {get_param: AdminPassword}
rabbit_host: {get_param: RabbitHost}
rabbit_username: {get_param: RabbitUserName}

7
overcloud-source.yaml
View File

@ -295,6 +295,10 @@ parameters:
default: 'True'
description: Allow automatic l3-agent failover
type: string
NeutronL3HA:
default: 'False'
description: Whether to enable l3-agent HA
type: string
NovaComputeDriver:
default: libvirt.LibvirtDriver
type: string
@ -448,6 +452,8 @@ resources:
get_param: NeutronMechanismDrivers
NeutronAllowL3AgentFailover:
get_param: NeutronAllowL3AgentFailover
NeutronL3HA:
get_param: NeutronL3HA
NovaCompute0AllNodesDeployment:
type: FileInclude
Path: nova-compute-instance.yaml
@ -614,6 +620,7 @@ resources:
router_distributed: {get_param: NeutronDVR}
mechanism_drivers: {get_param: NeutronMechanismDrivers}
allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
l3_ha: {get_param: NeutronL3HA}
ovs:
enable_tunneling: 'True'
local_ip:

6
overcloud-without-mergepy.yaml
View File

@ -139,6 +139,10 @@ parameters:
default: 'True'
description: Allow automatic l3-agent failover
type: string
NeutronL3HA:
default: 'False'
description: Whether to enable l3-agent HA
type: string
NovaPassword:
default: unset
description: The password for the nova service account, used by nova-api.
@ -517,6 +521,7 @@ resources:
NeutronAgentMode: {get_param: NeutronAgentMode}
NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover}
NeutronL3HA: {get_param: NeutronL3HA}
NeutronNetworkType: {get_param: NeutronNetworkType}
NeutronTunnelTypes: {get_param: NeutronTunnelTypes}
NovaPassword: {get_param: NovaPassword}
@ -577,6 +582,7 @@ resources:
NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice}
NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover}
NeutronL3HA: {get_param: NeutronL3HA}
NovaApiHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
NovaComputeDriver: {get_param: NovaComputeDriver}
NovaComputeExtraConfig: {get_param: NovaComputeExtraConfig}