stackforge/puppet-openstack
Code Issues Proposed changes

Added parameter for memcached_servers

Browse Source 
Nova module allows for an array of memcached servers
to be passed to it. This change presents a parameter
in openstack::controller to pass it to openstack::nova::controller

Change-Id: I3a5636ac93076da7fc5c664b9054a2d7d6f84183
This commit is contained in:
Matthew Black
2013-09-24 09:34:52 -04:00
parent c0d90a2e8a
commit d0850e21d3
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/controller.pp
View File

@@ -27,6 +27,8 @@
# [glance_user_password] Glance service user password. # [glance_user_password] Glance service user password.
# [nova_db_password] Nova DB password. # [nova_db_password] Nova DB password.
# [nova_user_password] Nova service password. # [nova_user_password] Nova service password.
# [nova_memcached_servers] (array) List of memcached servers for use with nova.
# (optional) Defaults to false. Values should be hostname:port format.
# #
# [purge_nova_config] # [purge_nova_config]
# Whether unmanaged nova.conf entries should be purged. # Whether unmanaged nova.conf entries should be purged.
@@ -153,6 +155,7 @@ class openstack::controller (
$glance_user_password, $glance_user_password,
$nova_db_password, $nova_db_password,
$nova_user_password, $nova_user_password,
$nova_memcached_servers = false,
$secret_key, $secret_key,
$mysql_root_password, $mysql_root_password,
# cinder and neutron password are not required b/c they are # cinder and neutron password are not required b/c they are
@@ -438,6 +441,7 @@ class openstack::controller (
nova_db_password => $nova_db_password, nova_db_password => $nova_db_password,
nova_db_user => $nova_db_user, nova_db_user => $nova_db_user,
nova_db_dbname => $nova_db_dbname, nova_db_dbname => $nova_db_dbname,
memcached_servers => $nova_memcached_servers,
enabled_apis => $enabled_apis, enabled_apis => $enabled_apis,
api_bind_address => $nova_bind_address, api_bind_address => $nova_bind_address,
# Rabbit # Rabbit

4
spec/classes/openstack_controller_spec.rb
View File

@@ -23,6 +23,7 @@ describe 'openstack::controller' do
:nova_bind_address => '0.0.0.0', :nova_bind_address => '0.0.0.0',
:nova_db_password => 'nova_pass', :nova_db_password => 'nova_pass',
:nova_user_password => 'nova_pass', :nova_user_password => 'nova_pass',
:nova_memcached_servers => false,
:cinder_db_password => 'cinder_pass', :cinder_db_password => 'cinder_pass',
:cinder_user_password => 'cinder_pass', :cinder_user_password => 'cinder_pass',
:secret_key => 'secret_key', :secret_key => 'secret_key',
@@ -465,7 +466,8 @@ describe 'openstack::controller' do
:image_service => 'nova.image.glance.GlanceImageService', :image_service => 'nova.image.glance.GlanceImageService',
:glance_api_servers => '10.0.0.1:9292', :glance_api_servers => '10.0.0.1:9292',
:debug => false, :debug => false,
:verbose => false :verbose => false,
:memcached_servers => false
) )
should contain_class('nova::api').with( should contain_class('nova::api').with(
:enabled => true, :enabled => true,

3
spec/classes/openstack_nova_controller_spec.rb
View File

@@ -48,7 +48,8 @@ describe 'openstack::nova::controller' do
:debug => false, :debug => false,
:verbose => false, :verbose => false,
:rabbit_hosts => false, :rabbit_hosts => false,
:rabbit_host => '127.0.0.1' :rabbit_host => '127.0.0.1',
:memcached_servers => false
) )
should contain_class('nova::api').with( should contain_class('nova::api').with(