From 42a3ffe5a054cbf2e57530825349247d3ca71b4e Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Wed, 3 Feb 2016 14:22:26 -0800
Subject: [PATCH] Expose br_name in controller and compute classes

With 700a70c parameterizing the name of the bridge to attach to, we now
need a way to control it through the node definition. This patch
exposes the parameter in the controller and compute classes that wrap
the veth defined type so that system-config can specify the bridge
name.

Change-Id: I10d0623a8b4fc0b4abfcb414673346cf944fbdfd
---
 manifests/compute.pp    | 5 ++++-
 manifests/controller.pp | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifests/compute.pp b/manifests/compute.pp
index f5e92c3..de2b983 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -2,13 +2,16 @@ class infracloud::compute(
   $nova_rabbit_password,
   $neutron_rabbit_password,
   $neutron_admin_password,
+  $br_name,
   $controller_public_address,
   $controller_management_address,
 ) {
 
   ### Networking ###
 
-  include ::infracloud::veth
+  class {'::infracloud::veth':
+    br_name => $br_name,
+  }
 
   ### Repos ###
   include ::apt
diff --git a/manifests/controller.pp b/manifests/controller.pp
index a45c1c3..949fec4 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -21,6 +21,7 @@ class infracloud::controller(
   $glance_ssl_cert_file_contents,
   $nova_ssl_key_file_contents,
   $nova_ssl_cert_file_contents,
+  $br_name,
   $controller_management_address,
   $controller_public_address = $::fqdn,
 ) {
@@ -40,7 +41,9 @@ class infracloud::controller(
 
   ### Networking ###
 
-  include ::infracloud::veth
+  class { '::infracloud::veth':
+    br_name => $br_name,
+  }
 
   ### Repos ###