From 0a967ea68a4f7eac139550b3d877cd0c0f0add5a Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Wed, 7 Nov 2012 00:15:35 -0800 Subject: [PATCH 1/2] Merge pull request #130 from bodepd/aimon_specs add spec tests --- manifests/controller.pp | 2 +- manifests/nova/controller.pp | 15 ++++++++------- spec/classes/openstack_compute_spec.rb | 1 + spec/classes/openstack_controller_spec.rb | 1 + 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/manifests/controller.pp b/manifests/controller.pp index dd22a99..a160825 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -36,7 +36,7 @@ # [secret_key] secret key to encode cookies, … # [cache_server_ip] local memcached instance ip # [cache_server_port] local memcached instance port -# [horizon] (bool) is horizon installed. Defaults to: true +# [horizon] (bool) is horizon installed. Defaults to: true # [swift] (bool) is swift installed # [quantum] (bool) is quantum installed # The next is an array of arrays, that can be used to add call-out links to the dashboard for other apps. diff --git a/manifests/nova/controller.pp b/manifests/nova/controller.pp index 67cb89f..dd8a91d 100644 --- a/manifests/nova/controller.pp +++ b/manifests/nova/controller.pp @@ -93,13 +93,14 @@ class openstack::nova::controller ( # Configure Nova class { 'nova': - sql_connection => $sql_connection, - rabbit_userid => $rabbit_user, - rabbit_password => $rabbit_password, - image_service => 'nova.image.glance.GlanceImageService', - glance_api_servers => $glance_connection, - verbose => $verbose, - rabbit_host => $rabbit_connection, + sql_connection => $sql_connection, + rabbit_userid => $rabbit_user, + rabbit_password => $rabbit_password, + rabbit_virtual_host => $rabbit_virtual_host, + image_service => 'nova.image.glance.GlanceImageService', + glance_api_servers => $glance_connection, + verbose => $verbose, + rabbit_host => $rabbit_connection, } # Configure nova-api diff --git a/spec/classes/openstack_compute_spec.rb b/spec/classes/openstack_compute_spec.rb index 2a9de1e..a217b3b 100644 --- a/spec/classes/openstack_compute_spec.rb +++ b/spec/classes/openstack_compute_spec.rb @@ -8,6 +8,7 @@ describe 'openstack::compute' do :internal_address => '0.0.0.0', :nova_user_password => 'nova_pass', :rabbit_password => 'rabbit_pw', + :rabbit_virtual_host => '/', :sql_connection => 'mysql://user:pass@host/dbname/', :cinder_sql_connection => 'mysql://user:pass@host/dbname/', :quantum => false, diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb index e0fae91..de158d9 100644 --- a/spec/classes/openstack_controller_spec.rb +++ b/spec/classes/openstack_controller_spec.rb @@ -12,6 +12,7 @@ describe 'openstack::controller' do :admin_email => 'some_user@some_fake_email_address.foo', :admin_password => 'ChangeMe', :rabbit_password => 'rabbit_pw', + :rabbit_virtual_host => '/', :keystone_db_password => 'keystone_pass', :keystone_admin_token => 'keystone_admin_token', :glance_db_password => 'glance_pass', From 2d4b7fbccf6fb13c087382dc89003f0b0a03eccc Mon Sep 17 00:00:00 2001 From: Aimon Bustardo Date: Wed, 7 Nov 2012 22:30:18 -0800 Subject: [PATCH 2/2] FIX: add missing arg. ADD: tests --- manifests/controller.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/controller.pp b/manifests/controller.pp index a160825..dd22a99 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -36,7 +36,7 @@ # [secret_key] secret key to encode cookies, … # [cache_server_ip] local memcached instance ip # [cache_server_port] local memcached instance port -# [horizon] (bool) is horizon installed. Defaults to: true +# [horizon] (bool) is horizon installed. Defaults to: true # [swift] (bool) is swift installed # [quantum] (bool) is quantum installed # The next is an array of arrays, that can be used to add call-out links to the dashboard for other apps.