diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-08-16 10:42:44 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-08-24 19:25:10 +0000 |
| commit | 0224b18f5d744e27367a7b2239b1aad71853fe9a (patch) | |
| tree | 292aa39020e50a1fb87e97b3260c87c240a11b70 /puppet | |
| parent | 85938c987c829731167659871c84b87242c4ea42 (diff) | |
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 <trozet@redhat.com>
Diffstat (limited to 'puppet')
| -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 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' |