From 2b6b247188aa9a04966306360982403a20f6c4a6 Mon Sep 17 00:00:00 2001
From: Soren Hansen <sorhanse@cisco.com>
Date: Wed, 9 May 2012 20:14:26 -0700
Subject: [PATCH 1/3] Fix typo

Param was called $export_resource, but when used it was expected to be
named $export_resources.
---
 manifests/controller.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/controller.pp b/manifests/controller.pp
index 654e93a..3dae9d9 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -39,7 +39,7 @@ class openstack::controller(
   $network_config          = {},
   # I do not think that this needs a bridge?
   $verbose                 = false,
-  $export_resource         = false
+  $export_resources        = true
 ) {
 
   $glance_api_servers = "${internal_address}:9292"

From f19f225f25a4c27bca0e119470e643f7949b0187 Mon Sep 17 00:00:00 2001
From: Soren Hansen <sorhanse@cisco.com>
Date: Wed, 9 May 2012 20:15:41 -0700
Subject: [PATCH 2/3] Remove network_host parameter

network_host has been removed upstream a while ago. It's no longer
needed at all.
---
 manifests/compute.pp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/manifests/compute.pp b/manifests/compute.pp
index bae65f8..2db95b5 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -17,7 +17,6 @@ class openstack::compute(
   $fixed_range         = '10.0.0.0/16',
   $network_manager     = 'nova.network.manager.FlatDHCPManager',
   $multi_host          = false,
-  $network_host        = false,
   $network_config      = {},
   # my address
   # conection information
@@ -74,12 +73,8 @@ class openstack::compute(
     }
   } else {
     $enable_network_service = false
-    if ! $network_host {
-      fail('network_host must be defined for non multi host compute nodes')
-    }
     nova_config {
       'multi_host':   value => 'False';
-      'network_host': value => $network_host;
     }
   }
 

From 3e419bc834751bc2625a7ff2df2d986a62dcb363 Mon Sep 17 00:00:00 2001
From: Soren Hansen <sorhanse@cisco.com>
Date: Wed, 9 May 2012 20:17:57 -0700
Subject: [PATCH 3/3] Use rabbit_host parameter

openstack::compute takes a rabbit_host parameter, but it's not getting
passed to class[nova].
---
 manifests/compute.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/compute.pp b/manifests/compute.pp
index 2db95b5..683c333 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -38,6 +38,7 @@ class openstack::compute(
     rabbit_userid      => $rabbit_user,
     rabbit_password    => $rabbit_password,
     image_service      => 'nova.image.glance.GlanceImageService',
+    rabbit_host        => $rabbit_host,
     glance_api_servers => $glance_api_servers,
     verbose            => $verbose,
   }