Add glance configuration to multi-node deployment

manifests/ubuntu/cc.pp

@@ -11,6 +11,10 @@ class nova::ubuntu::cc (
   $flat_network_bridge_ip  = '11.0.0.1',
   $flat_network_bridge_netmask  = '255.255.255.0',
 
+  $image_service = 'nova.image.local.LocalImageService',
+  $glance_host,
+  $glance_port = '9292',
+
   $nova_network = '11.0.0.0',
   $available_ips = '256',
 

manifests/ubuntu/compute.pp

@@ -3,6 +3,12 @@ class nova::ubuntu::compute (
   $api_server,
   $rabbit_host,
   $db_host,
+
+  # default to local image service.
+  $image_service = undef,
+  $glance_host = undef,
+  $glance_port = '9292',
+
   $flat_network_bridge,
   $flat_network_bridge_ip,
   $flat_network_bridge_netmask,
@@ -24,6 +30,8 @@ class nova::ubuntu::compute (
     rabbit_userid       => $rabbit_userid,
     rabbit_virtual_host => $rabbit_virtual_host,
     sql_connection      => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
+    glance_host         => $glance_host,
+    glance_port         => $glance_port,
   }
 
   # TODO For now lets worry about FlatManager, then FlatDHCP, etc.

tests/ubuntu/cc.pp

@@ -16,6 +16,9 @@ class { 'nova::ubuntu::cc':
   nova_network => '11.0.0.0',
   available_ips => '256',
 
+  image_service => 'nova.image.glance.GlanceImageService',
+  glance_host => $ipaddress,
+
   db_password => 'password',
 
   db_allowed_hosts => ['somehost', '10.0.0.2', '10.0.0.3'],
@@ -23,3 +26,8 @@ class { 'nova::ubuntu::cc':
   admin_user => 'admin',
   project_name => 'novaproject',
 }
+
+class { "glance::api": }
+class { "glance::registry":
+  sql_connection => "mysql://nova:password@localhost/nova",
+}

tests/ubuntu/compute.pp

@@ -10,6 +10,11 @@ class { 'nova::ubuntu::compute':
   db_host => '10.0.0.2',
   db_user => 'nova',
   db_password => 'password',
+
+  image_service => 'nova.image.glance.GlanceImageService',
+  glance_host => '10.0.0.2',
+
+
   flat_network_bridge => 'br100',
   flat_network_bridge_ip => '11.0.0.2',
   flat_network_bridge_netmask => '255.255.255.0',