stackforge
/
puppet-openstack
Code Issues Proposed changes

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

This commit is contained in:
Jenkins 2014-03-18 16:28:48 +00:00 committed by Gerrit Code Review
parent 16c4e7fc5a d4b5fae753
commit 6b35e78705
6 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/cinder/all.pp
View File

@ -15,6 +15,7 @@ class openstack::cinder::all(
$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 openstack::cinder::all(
}
}
}
class { '::cinder::glance':
glance_api_servers => $glance_api_servers
}
}

4
manifests/cinder/controller.pp
View File

@ -15,6 +15,7 @@ class openstack::cinder::controller(
$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 @@ class openstack::cinder::controller(
enabled => $scheduler_enabled,
}
class { '::cinder::glance':
glance_api_servers => $glance_api_servers
}
}

5
manifests/cinder/storage.pp
View File

@ -6,6 +6,7 @@ class openstack::cinder::storage(
$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 @@ class openstack::cinder::storage(
warning("Unsupported volume driver: ${volume_driver}, make sure you are configuring this yourself")
}
}
class { '::cinder::glance':
glance_api_servers => $glance_api_servers
}
}

3
spec/classes/openstack_cinder_all_spec.rb
View File

@ -57,6 +57,9 @@ describe 'openstack::cinder::all' do
: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

3
spec/classes/openstack_cinder_controller_spec.rb
View File

@ -49,6 +49,9 @@ describe 'openstack::cinder::controller' do
: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

3
spec/classes/openstack_cinder_storage_spec.rb
View File

@ -37,6 +37,9 @@ describe 'openstack::cinder::storage' do
: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