diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-05 15:23:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-05 15:23:50 +0000 |
| commit | d625668939eb4a45440659e808a7b72fc21334fe (patch) | |
| tree | 8e18b5d322b376931cda6934e562f09356a74521 /puppet/compute-puppet.yaml | |
| parent | 49639ec8a1335fc6bc45ff9ceb88e4ad5753802d (diff) | |
| parent | 607311e02b49c3f27498c4c8c8137c26a99a5800 (diff) | |
Merge "Wire Neutron VLAN ranges param as array to puppet"
Diffstat (limited to 'puppet/compute-puppet.yaml')
| -rw-r--r-- | puppet/compute-puppet.yaml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index d2cca8fb..de888c7f 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -132,7 +132,7 @@ parameters: The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the Neutron documentation for permitted values. Defaults to permitting any VLAN on the 'datacentre' physical network (See NeutronBridgeMappings). - type: string + type: comma_delimited_list NeutronPassword: default: unset description: The password for the neutron service account, used by neutron agents. @@ -369,7 +369,7 @@ resources: neutron_tenant_network_type: {get_input: neutron_tenant_network_type} neutron_tunnel_types: {get_input: neutron_tunnel_types} - neutron::network_vlan_ranges: {get_input: neutron_network_vlan_ranges} + neutron::plugins::ml2::network_vlan_ranges: {get_input: neutron_network_vlan_ranges} neutron_bridge_mappings: {get_input: neutron_bridge_mappings} neutron::agents::ml2::ovs::enable_tunneling: {get_input: neutron_enable_tunneling} neutron_physical_bridge: {get_input: neutron_physical_bridge} @@ -424,7 +424,14 @@ resources: neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronLocalIp]}]} neutron_tenant_network_type: {get_param: NeutronNetworkType} neutron_tunnel_types: {get_param: NeutronTunnelTypes} - neutron_network_vlan_ranges: {get_param: NeutronNetworkVLANRanges} + neutron_network_vlan_ranges: + str_replace: + template: "['RANGES']" + params: + RANGES: + list_join: + - "','" + - {get_param: NeutronNetworkVLANRanges} neutron_bridge_mappings: {get_param: NeutronBridgeMappings} neutron_enable_tunneling: {get_param: NeutronEnableTunnelling} neutron_physical_bridge: {get_param: NeutronPhysicalBridge} |