Install cirros image

fuel

@@ -1 +1 @@
-Subproject commit b8ed31368ec693862b03c4830607d4c510fc39cc
+Subproject commit 70c9778c4def3869022dc9656472f884cba0e4ac

puppet/osnailyfacter/manifests/cluster_ha.pp

@@ -93,8 +93,13 @@ class compact_controller {
       include osnailyfacter::test_controller
 
       class { compact_controller: }
+      class { 'openstack::img::cirros':
+        os_password               => $admin_password,
+        img_name                  => "TestVM",
+      }
 
       Class[osnailyfacter::network_setup] -> Class[openstack::controller_ha]
+      Class[glance::api]        -> Class[openstack::img::cirros]
     }
 
     "compute" : {
@@ -127,6 +132,7 @@ class compact_controller {
         tenant_network_type    => $tenant_network_type,
         segment_range          => $segment_range,
         cinder                 => $cinder,
+        db_host                => $internal_virtual_ip,
       }
 
       Class[osnailyfacter::network_setup] -> Class[openstack::compute]

puppet/osnailyfacter/manifests/cluster_simple.pp

@@ -65,7 +65,13 @@ Exec { logoutput => true }
         controller_node      => $controller_node_address,
       }
 
+      class { 'openstack::img::cirros':
+        os_password               => $admin_password,
+        img_name                  => "TestVM",
+      }
+
       Class[osnailyfacter::network_setup] -> Class[openstack::controller]
+      Class[glance::api]        -> Class[openstack::img::cirros]
     }
 
     "compute" : {
@@ -95,6 +101,7 @@ Exec { logoutput => true }
         #quantum_user_password  => $quantum_user_password,
         #tenant_network_type    => $tenant_network_type,
         service_endpoint       => $controller_node_address,
+        db_host                => $conrtoller_node_address,
         verbose                => $verbose,
       }
 

requirements-rpm.txt

@@ -4,6 +4,7 @@ avahi
 bind-utils
 byacc
 centos-release
+cirros-testvm
 cman
 cobbler
 cobbler-web