aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-06-02 08:32:55 -0400
committerGiulio Fidente <gfidente@redhat.com>2015-06-05 09:27:42 -0400
commit607311e02b49c3f27498c4c8c8137c26a99a5800 (patch)
tree13357cfea417d2b883d7f50e40dd57c4f2ec731f /environments
parent92271fb0545bae0e4bd9aac2dfb0017e9bc6d919 (diff)
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
Diffstat (limited to 'environments')
-rw-r--r--environments/puppet-tenant-vlan.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/environments/puppet-tenant-vlan.yaml b/environments/puppet-tenant-vlan.yaml
new file mode 100644
index 00000000..0df63caf
--- /dev/null
+++ b/environments/puppet-tenant-vlan.yaml
@@ -0,0 +1,4 @@
+parameters:
+ NeutronNetworkType: vlan
+ NeutronEnableTunnelling: false
+ NeutronNetworkVLANRanges: datacentre:1:1000 \ No newline at end of file