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 /puppet | |
| parent | 37f712d07fec7341c0ca42cb175d370a20736a9f (diff) | |
| parent | 987174c7b4514d08a61505997ddb1a6ccbda77de (diff) | |
Merge "Implement Neutron enable_isolated_metadata parameters"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 920bd885..2e8c3126 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -366,6 +366,10 @@ parameters: default: 'True' description: Allow automatic l3-agent failover type: string + NeutronEnableIsolatedMetadata: + default: 'False' + description: If True, DHCP provide metadata route to VM. + type: string NeutronEnableTunnelling: type: string default: "True" @@ -712,6 +716,7 @@ resources: bootstack_nodeid: {get_attr: [Controller, name]} neutron_enable_tunneling: {get_param: NeutronEnableTunnelling} neutron_enable_l2pop: {get_param: NeutronEnableL2Pop} + neutron_enable_isolated_metadata: {get_param: NeutronEnableIsolatedMetadata} haproxy_log_address: {get_param: HAProxySyslogAddress} heat.watch_server_url: list_join: @@ -1172,6 +1177,7 @@ resources: neutron::agents::l3::external_network_bridge: {get_input: neutron_external_network_bridge} neutron::agents::ml2::ovs::enable_tunneling: {get_input: neutron_enable_tunneling} neutron::agents::ml2::ovs::l2_population: {get_input: neutron_enable_l2pop} + neutron::agents::dhcp::enable_isolated_metadata: {get_input: neutron_enable_isolated_metadata} neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip} neutron_flat_networks: {get_input: neutron_flat_networks} neutron::agents::metadata::shared_secret: {get_input: neutron_metadata_proxy_shared_secret} |