From d0850e21d31f808cf5b6274d4bf76663d4f402f8 Mon Sep 17 00:00:00 2001 From: Matthew Black Date: Tue, 24 Sep 2013 09:34:52 -0400 Subject: [PATCH] Added parameter for memcached_servers 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 --- manifests/controller.pp | 4 ++++ spec/classes/openstack_controller_spec.rb | 4 +++- spec/classes/openstack_nova_controller_spec.rb | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/manifests/controller.pp b/manifests/controller.pp index 4644be9..dba4a1a 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -27,6 +27,8 @@ # [glance_user_password] Glance service user password. # [nova_db_password] Nova DB 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] # Whether unmanaged nova.conf entries should be purged. @@ -153,6 +155,7 @@ class openstack::controller ( $glance_user_password, $nova_db_password, $nova_user_password, + $nova_memcached_servers = false, $secret_key, $mysql_root_password, # 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_user => $nova_db_user, nova_db_dbname => $nova_db_dbname, + memcached_servers => $nova_memcached_servers, enabled_apis => $enabled_apis, api_bind_address => $nova_bind_address, # Rabbit diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb index d1970f4..d04d46a 100644 --- a/spec/classes/openstack_controller_spec.rb +++ b/spec/classes/openstack_controller_spec.rb @@ -23,6 +23,7 @@ describe 'openstack::controller' do :nova_bind_address => '0.0.0.0', :nova_db_password => 'nova_pass', :nova_user_password => 'nova_pass', + :nova_memcached_servers => false, :cinder_db_password => 'cinder_pass', :cinder_user_password => 'cinder_pass', :secret_key => 'secret_key', @@ -465,7 +466,8 @@ describe 'openstack::controller' do :image_service => 'nova.image.glance.GlanceImageService', :glance_api_servers => '10.0.0.1:9292', :debug => false, - :verbose => false + :verbose => false, + :memcached_servers => false ) should contain_class('nova::api').with( :enabled => true, diff --git a/spec/classes/openstack_nova_controller_spec.rb b/spec/classes/openstack_nova_controller_spec.rb index ef0de92..2fe3d72 100644 --- a/spec/classes/openstack_nova_controller_spec.rb +++ b/spec/classes/openstack_nova_controller_spec.rb @@ -48,7 +48,8 @@ describe 'openstack::nova::controller' do :debug => false, :verbose => 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(