Merge "Add configuration for glance-api used by cinder."

Author: Jenkins

manifests/cinder/all.pp

@@ -15,6 +15,7 @@
   $rabbit_hosts             =  undef,
   $rabbit_port              = '5672',
   $rabbit_virtual_host      = '/',
+  $glance_api_servers       = '127.0.0.1:9292',
   # Database. Currently mysql is the only option.
   $db_type                  = 'mysql',
   $db_user                  = 'cinder',
@@ -113,4 +114,8 @@
       }
     }
   }
+
+  class { '::cinder::glance':
+    glance_api_servers => $glance_api_servers
+  }
 }

manifests/cinder/controller.pp

@@ -15,6 +15,7 @@
   $rabbit_hosts             =  false,
   $rabbit_port              = '5672',
   $rabbit_virtual_host      = '/',
+  $glance_api_servers       = '127.0.0.1:9292',
   # Database. Currently mysql is the only option.
   $db_type                  = 'mysql',
   $db_user                  = 'cinder',
@@ -80,4 +81,7 @@
     enabled                => $scheduler_enabled,
   }
 
+  class { '::cinder::glance':
+    glance_api_servers => $glance_api_servers
+  }
 }

manifests/cinder/storage.pp

@@ -6,6 +6,7 @@
   $rabbit_hosts          = false,
   $rabbit_port           = '5672',
   $rabbit_virtual_host   = '/',
+  $glance_api_servers    = '127.0.0.1:9292',
   $package_ensure        = 'present',
   $api_paste_config      = '/etc/cinder/api-paste.ini',
   $volume_package_ensure = 'present',
@@ -70,4 +71,8 @@
       warning("Unsupported volume driver: ${volume_driver}, make sure you are configuring this yourself")
     }
   }
+
+  class { '::cinder::glance':
+    glance_api_servers => $glance_api_servers
+  }
 }

spec/classes/openstack_cinder_all_spec.rb

@@ -57,6 +57,9 @@
       :iscsi_ip_address => '127.0.0.1',
       :volume_group     => 'cinder-volumes'
     )
+    should contain_class('cinder::glance').with(
+      :glance_api_servers => '127.0.0.1:9292'
+    )
     should_not contain_class('cinder::setup_test_volume')
   end
 

spec/classes/openstack_cinder_controller_spec.rb

@@ -49,6 +49,9 @@
       :package_ensure         => 'present',
       :enabled                => true
     )
+    should contain_class('cinder::glance').with(
+      :glance_api_servers     => '127.0.0.1:9292'
+    )
   end
 
   describe 'with custom syslog settings' do

spec/classes/openstack_cinder_storage_spec.rb

@@ -37,6 +37,9 @@
       :iscsi_ip_address => '127.0.0.1',
       :volume_group     => 'cinder-volumes'
     )
+    should contain_class('cinder::glance').with(
+      :glance_api_servers => '127.0.0.1:9292'
+    )
     should_not contain_class('cinder::setup_test_volume')
   end