diff --git a/manifests/site.pp b/manifests/site.pp
index 8bc0486..9aceb2b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,13 +9,23 @@ $rabbit_vhost    = '/'
 $rabbit_host     = 'rabbitmq'
 $rabbit_port     = '5672'
 
+$glance_api_servers = 'glance:9292'
+$glance_host        = 'glance'
+$glance_port        = '9292'
+
+$api_server = 'controller'
+
 resources { 'nova_config':
   purge => true,
 }
 
 node db {
   class { 'mysql::server':
-    config_hash => {'bind_address' => '0.0.0.0'}
+    config_hash => {
+                     'bind_address' => '0.0.0.0'
+                     #'root_password' => 'foo',
+                     #'etc_root_password' => true
+                   }
   }
   class { 'mysql::ruby': }
   class { 'nova::db':
@@ -24,7 +34,7 @@ node db {
     user          => $db_name,
     host          => $clientcert,
     # does glance need access?
-    allowed_hosts => ['controller', 'glance'],
+    allowed_hosts => ['controller', 'glance', 'compute'],
   }
 }
 
@@ -43,16 +53,40 @@ node controller {
 
     image_service => 'nova.image.glance.GlanceImageService',
 
-    glance_api_servers => 'glance:9292',
-    glance_host => 'glance',
-    glance_port => '9292',
+    glance_api_servers => $glance_api_servers,
+    glance_host => $glance_host,
+    glance_port => $glance_port,
 
     libvirt_type => 'qemu',
   }
 }
 
 node compute {
-
+  class { 'nova::compute':
+    api_server     => $api_server,
+    enabled        => true,
+    api_port       => 8773,
+    aws_address    => '169.254.169.254',
+  }
+  class { 'nova::compute::libvirt': 
+    libvirt_type                => 'qemu',
+    flat_network_bridge         => 'br100',
+    flat_network_bridge_ip      => '11.0.0.1',
+    flat_network_bridge_netmask => '255.255.255.0',
+  }
+  class { "nova":
+    verbose             => $verbose,
+    sql_connection      => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
+    image_service       => $image_service,
+    glance_api_servers  => $glance_api_servers,
+    glance_host         => $glance_host,
+    glance_port         => $glance_port,
+    rabbit_host         => $rabbit_host,
+    rabbit_port         => $rabbit_port,
+    rabbit_userid       => $rabbit_user,
+    rabbit_password     => $rabbit_password,
+    rabbit_virtual_host => $rabbit_virtual_host,
+  }
 }
 
 node glance {
diff --git a/modules/mysql b/modules/mysql
index b93e0f6..29bdca5 160000
--- a/modules/mysql
+++ b/modules/mysql
@@ -1 +1 @@
-Subproject commit b93e0f65cb647be2795252e0537a8650e77bbdcb
+Subproject commit 29bdca5a76ee40f3441b8192d68275ac58f7bc32
diff --git a/modules/nova b/modules/nova
index 5d38e9b..71c65b6 160000
--- a/modules/nova
+++ b/modules/nova
@@ -1 +1 @@
-Subproject commit 5d38e9b1c8787f90c7a676c8acf8b1ad66f0fbd4
+Subproject commit 71c65b66c049ad05ec76a063776c9c7530b7ce82