Merge pull request #135 from aimonb/master
FIX: add missing arg. ADD: tests
This commit is contained in:
@@ -93,13 +93,14 @@ class openstack::nova::controller (
|
|||||||
|
|
||||||
# Configure Nova
|
# Configure Nova
|
||||||
class { 'nova':
|
class { 'nova':
|
||||||
sql_connection => $sql_connection,
|
sql_connection => $sql_connection,
|
||||||
rabbit_userid => $rabbit_user,
|
rabbit_userid => $rabbit_user,
|
||||||
rabbit_password => $rabbit_password,
|
rabbit_password => $rabbit_password,
|
||||||
image_service => 'nova.image.glance.GlanceImageService',
|
rabbit_virtual_host => $rabbit_virtual_host,
|
||||||
glance_api_servers => $glance_connection,
|
image_service => 'nova.image.glance.GlanceImageService',
|
||||||
verbose => $verbose,
|
glance_api_servers => $glance_connection,
|
||||||
rabbit_host => $rabbit_connection,
|
verbose => $verbose,
|
||||||
|
rabbit_host => $rabbit_connection,
|
||||||
}
|
}
|
||||||
|
|
||||||
# Configure nova-api
|
# Configure nova-api
|
||||||
|
@@ -8,6 +8,7 @@ describe 'openstack::compute' do
|
|||||||
:internal_address => '0.0.0.0',
|
:internal_address => '0.0.0.0',
|
||||||
:nova_user_password => 'nova_pass',
|
:nova_user_password => 'nova_pass',
|
||||||
:rabbit_password => 'rabbit_pw',
|
:rabbit_password => 'rabbit_pw',
|
||||||
|
:rabbit_virtual_host => '/',
|
||||||
:sql_connection => 'mysql://user:pass@host/dbname/',
|
:sql_connection => 'mysql://user:pass@host/dbname/',
|
||||||
:cinder_sql_connection => 'mysql://user:pass@host/dbname/',
|
:cinder_sql_connection => 'mysql://user:pass@host/dbname/',
|
||||||
:quantum => false,
|
:quantum => false,
|
||||||
|
@@ -12,6 +12,7 @@ describe 'openstack::controller' do
|
|||||||
:admin_email => 'some_user@some_fake_email_address.foo',
|
:admin_email => 'some_user@some_fake_email_address.foo',
|
||||||
:admin_password => 'ChangeMe',
|
:admin_password => 'ChangeMe',
|
||||||
:rabbit_password => 'rabbit_pw',
|
:rabbit_password => 'rabbit_pw',
|
||||||
|
:rabbit_virtual_host => '/',
|
||||||
:keystone_db_password => 'keystone_pass',
|
:keystone_db_password => 'keystone_pass',
|
||||||
:keystone_admin_token => 'keystone_admin_token',
|
:keystone_admin_token => 'keystone_admin_token',
|
||||||
:glance_db_password => 'glance_pass',
|
:glance_db_password => 'glance_pass',
|
||||||
|
Reference in New Issue
Block a user