diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-18 11:24:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-18 11:24:45 +0000 |
| commit | f6ff1a819190877093a90fb97ef7c9c8f6ce5164 (patch) | |
| tree | b6d1c628bf88322f6f4fc2cd46cdf57ca40936da /os-apply-config | |
| parent | 37f712d07fec7341c0ca42cb175d370a20736a9f (diff) | |
| parent | 987174c7b4514d08a61505997ddb1a6ccbda77de (diff) | |
Merge "Implement Neutron enable_isolated_metadata parameters"
Diffstat (limited to 'os-apply-config')
| -rw-r--r-- | os-apply-config/controller.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/os-apply-config/controller.yaml b/os-apply-config/controller.yaml index bf32f250..aed2367c 100644 --- a/os-apply-config/controller.yaml +++ b/os-apply-config/controller.yaml @@ -355,6 +355,10 @@ parameters: type: number default: 3 description: The number of neutron dhcp agents to schedule per network + NeutronEnableIsolatedMetadata: + default: 'False' + description: If True, DHCP provide metadata route to VM. + type: string NeutronEnableTunnelling: type: string default: "True" @@ -728,6 +732,7 @@ resources: allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover} l3_ha: {get_input: neutron_l3_ha} dhcp_agents_per_network: {get_input: neutron_dhcp_agents_per_network} + enable_isolated_metadata: {get_input: neutron_enable_isolated_metadata} ovs: enable_tunneling: {get_input: neutron_enable_tunneling} l2_population: {get_input: neutron_enable_l2pop} @@ -891,6 +896,7 @@ resources: controller_virtual_ip: {get_param: VirtualIP} neutron_enable_tunneling: {get_param: NeutronEnableTunnelling} neutron_enable_l2pop: {get_param: NeutronEnableL2Pop} + neutron_enable_isolated_metadata: {get_param: NeutronEnableIsolatedMetadata} heat.watch_server_url: list_join: - '' |