diff --git a/manifests/compute.pp b/manifests/compute.pp
index bae65f8..683c333 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
@@ -39,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,
   }
@@ -74,12 +74,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;
     }
   }
 
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"