From 607311e02b49c3f27498c4c8c8137c26a99a5800 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 2 Jun 2015 08:32:55 -0400 Subject: Wire Neutron VLAN ranges param as array to puppet Turns NeutronNetworkVLANRanges into a list and makes it consumable by neutron::plugins::ml2::network_vlan_ranges as an array. Previously usage of vlans was impossible due to puppet-neutron failing to join() network_vlan_ranges. Also fixes wiring of network_vlan_ranges on computes and adds a sample environment file to test use of vlans for tenant networks. Change-Id: I8725cdb9591dd8d0b7125fdacbefdc9138703266 --- controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'controller.yaml') diff --git a/controller.yaml b/controller.yaml index 8c1b93d2..82cff3f6 100644 --- a/controller.yaml +++ b/controller.yaml @@ -283,7 +283,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 and db account, used by neutron agents. -- cgit 1.2.3-korg