From 0224b18f5d744e27367a7b2239b1aad71853fe9a Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 16 Aug 2016 10:42:44 -0400 Subject: Fixes Neutron metadata parameters in THT Changes include: - Adds missing parameter to enable DHCP Metadata networks, which is required to enable isolated or forced metadata via DHCP agent - Fixes isolated metadata parameter to use a boolean - Fixes regression where force metadata parameter was accidentally removed Closes-Bug: 1613743 Change-Id: I08f907fe8a8e89e108351b84db33c4d9c004b957 Signed-off-by: Tim Rozet --- puppet/services/neutron-dhcp.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml index 322e018d..78c86cb9 100644 --- a/puppet/services/neutron-dhcp.yaml +++ b/puppet/services/neutron-dhcp.yaml @@ -9,10 +9,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: @@ -28,6 +37,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' -- cgit 1.2.3-korg