From e75da4220be7c52d55e9cba246ea657600cf6428 Mon Sep 17 00:00:00 2001
From: Joe Topjian <joe@topjian.net>
Date: Wed, 24 Oct 2012 10:18:02 -0600
Subject: [PATCH] vlan fixes

---
 manifests/manage/network.pp | 4 +++-
 manifests/network.pp        | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/manifests/manage/network.pp b/manifests/manage/network.pp
index cedc02bc1..16fb907f9 100644
--- a/manifests/manage/network.pp
+++ b/manifests/manage/network.pp
@@ -9,7 +9,8 @@ define nova::manage::network (
   $network,
   $num_networks = 1,
   $network_size = 255,
-  $project = undef
+  $vlan_start   = undef,
+  $project      = undef
 ) {
 
   File['/etc/nova/nova.conf'] -> Nova_network[$name]
@@ -21,6 +22,7 @@ define nova::manage::network (
     num_networks => $num_networks,
     network_size => $network_size,
     project      => $project,
+    vlan_start   => $vlan_start,
   }
 
 }
diff --git a/manifests/network.pp b/manifests/network.pp
index 4b7600805..ddebeba2c 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -43,6 +43,12 @@ class nova::network(
     nova_config { 'floating_range':   value => $floating_range }
   }
 
+  if has_key($config_overrides, 'vlan_start') {
+    $vlan_start = $config_overrides['vlan_start']
+  } else {
+    $vlan_start = undef
+  }
+
   if $install_service {
     nova::generic_service { 'network':
       enabled        => $enabled,
@@ -58,6 +64,7 @@ class nova::network(
       network       => $fixed_range,
       num_networks  => $num_networks,
       network_size  => $network_size,
+      vlan_start    => $vlan_start,
     }
     if $floating_range {
       nova::manage::floating { 'nova-vm-floating':