diff --git a/manifests/ubuntu/cc.pp b/manifests/ubuntu/cc.pp
index 9107a8b6b..168e22da5 100644
--- a/manifests/ubuntu/cc.pp
+++ b/manifests/ubuntu/cc.pp
@@ -41,6 +41,8 @@ class nova::ubuntu::cc (
     verbose         => $verbose,
     sql_connection  => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
     image_service   => $image_service,
+    glance_host     => $glance_host,
+    glance_port     => $glance_port,
   }
 
   class { "nova::api": enabled => true }
diff --git a/tests/ubuntu/cc.pp b/tests/ubuntu/cc.pp
index ef4f5ddbc..1aaf75db1 100644
--- a/tests/ubuntu/cc.pp
+++ b/tests/ubuntu/cc.pp
@@ -21,13 +21,18 @@ class { 'nova::ubuntu::cc':
 
   db_password => 'password',
 
-  db_allowed_hosts => ['somehost', '10.0.0.2', '10.0.0.3'],
+  db_allowed_hosts => ['somehost', '10.0.0.2', '10.0.0.3', '10.0.0.5'],
 
   admin_user => 'admin',
   project_name => 'novaproject',
 }
 
-class { "glance::api": }
+class { "glance::api":
+  verbose => 'true',
+  api_debug => 'true',
+}
 class { "glance::registry":
+  verbose => 'true',
+  debug => 'true',
   sql_connection => "mysql://nova:password@localhost/nova",
 }
diff --git a/tests/ubuntu/compute.pp b/tests/ubuntu/compute.pp
index 4311d0664..aefa3d22a 100644
--- a/tests/ubuntu/compute.pp
+++ b/tests/ubuntu/compute.pp
@@ -5,14 +5,14 @@ resources { 'nova_config':
 }
 
 class { 'nova::ubuntu::compute':
-  api_server => '10.0.0.2',
-  rabbit_host => '10.0.0.2',
-  db_host => '10.0.0.2',
+  api_server => '10.0.0.4',
+  rabbit_host => '10.0.0.4',
+  db_host => '10.0.0.4',
   db_user => 'nova',
   db_password => 'password',
 
   image_service => 'nova.image.glance.GlanceImageService',
-  glance_host => '10.0.0.2',
+  glance_host => '10.0.0.4',
 
 
   flat_network_bridge => 'br100',