diff options
author | 2016-08-24 22:26:18 +0000 | |
---|---|---|
committer | 2016-08-24 22:26:18 +0000 | |
commit | a6044b2ba9933e05b7b4685c4863c70410238bfe (patch) | |
tree | bc4cac738eb54bd7b7f8660f00cb50224f1c2796 /puppet/services | |
parent | d7035cf80c1d79fad555e125799805c964c154a9 (diff) | |
parent | 0224b18f5d744e27367a7b2239b1aad71853fe9a (diff) |
Merge "Fixes Neutron metadata parameters in THT"
Diffstat (limited to 'puppet/services')
-rw-r--r-- | puppet/services/neutron-dhcp.yaml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml index ed2dbd0e..513cb2d4 100644 --- a/puppet/services/neutron-dhcp.yaml +++ b/puppet/services/neutron-dhcp.yaml @@ -18,10 +18,19 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + NeutronEnableMetadataNetwork: + default: false + description: If True, DHCP provide metadata network. Requires either + IsolatedMetadata or ForceMetadata parameters to also be True. + type: boolean NeutronEnableIsolatedMetadata: - default: 'False' + default: false description: If True, DHCP provide metadata route to VM. - type: string + type: boolean + NeutronEnableForceMetadata: + default: false + description: If True, DHCP always provides metadata route to VM. + type: boolean resources: @@ -41,6 +50,8 @@ outputs: map_merge: - get_attr: [NeutronBase, role_data, config_settings] - neutron::agents::dhcp::enable_isolated_metadata: {get_param: NeutronEnableIsolatedMetadata} + neutron::agents::dhcp::enable_force_metadata: {get_param: NeutronEnableForceMetadata} + neutron::agents::dhcp::enable_metadata_network: {get_param: NeutronEnableMetadataNetwork} tripleo.neutron_dhcp.firewall_rules: '115 neutron dhcp input': proto: 'udp' |