From dc7016e3af0a7fde21c8ee6bcbc42e6c60abf5be Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 17 Feb 2014 14:19:01 +0100 Subject: [PATCH] compute: fix memcache configuration Close bug #256 Signed-off-by: Emilien Macchi --- manifests/compute.pp | 8 ++++++++ manifests/compute/controller.pp | 5 ----- spec/classes/cloud_compute_controller_spec.rb | 7 +++---- spec/classes/cloud_compute_hypervisor_spec.rb | 3 +++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/manifests/compute.pp b/manifests/compute.pp index 3e86276d..132e4bac 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -63,6 +63,11 @@ # (optional) Syslog facility to receive log lines # Defaults value in params # +# [*memcache_servers*] +# (optionnal) Memcached servers used by Keystone. Should be an array. +# Default value in params +# + class cloud::compute( $nova_db_host = $os_params::nova_db_host, $nova_db_user = $os_params::nova_db_user, @@ -79,6 +84,7 @@ class cloud::compute( $neutron_protocol = $os_params::ks_neutron_public_proto, $neutron_password = $os_params::ks_neutron_password, $neutron_region_name = $os_params::region, + $memcache_servers = $os_params::memcache_servers, $availability_zone = $os_params::region ) { @@ -97,6 +103,7 @@ class cloud::compute( rabbit_hosts => $rabbit_hosts, rabbit_password => $rabbit_password, glance_api_servers => "http://${ks_glance_internal_host}:${glance_api_port}", + memcached_servers => $memcache_servers, verbose => $verbose, debug => $debug, log_facility => $log_facility, @@ -113,6 +120,7 @@ class cloud::compute( nova_config { 'DEFAULT/resume_guests_state_on_host_boot': value => true; 'DEFAULT/default_availability_zone': value => $availability_zone; + 'DEFAULT/servicegroup_driver': value => 'mc'; } # Note(EmilienM): diff --git a/manifests/compute/controller.pp b/manifests/compute/controller.pp index 9b67f94c..b0fe0555 100644 --- a/manifests/compute/controller.pp +++ b/manifests/compute/controller.pp @@ -52,11 +52,6 @@ class cloud::compute::controller( host => $api_eth } - # Extra configuration for compute controllers: - nova_config { - 'DEFAULT/servicegroup_driver': value => 'mc'; - } - @@haproxy::balancermember{"${::fqdn}-compute_api_ec2": listening_service => 'ec2_api_cluster', server_names => $::hostname, diff --git a/spec/classes/cloud_compute_controller_spec.rb b/spec/classes/cloud_compute_controller_spec.rb index b57e4d9d..780aef39 100644 --- a/spec/classes/cloud_compute_controller_spec.rb +++ b/spec/classes/cloud_compute_controller_spec.rb @@ -39,6 +39,7 @@ describe 'cloud::compute::controller' do neutron_endpoint => '10.0.0.1', neutron_region_name => 'MyRegion', neutron_password => 'secrete', + memcache_servers => ['10.0.0.1','10.0.0.2'], log_facility => 'LOG_LOCAL0' }" end @@ -63,11 +64,13 @@ describe 'cloud::compute::controller' do :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', :rabbit_virtual_host => '/', + :memcached_servers => ['10.0.0.1','10.0.0.2'], :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', :glance_api_servers => 'http://10.0.0.1:9292' ) should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') + should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc') end it 'configure neutron on compute node' do @@ -120,10 +123,6 @@ describe 'cloud::compute::controller' do ) end - it 'configure extra parameters' do - should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc') - end - end context 'on Debian platforms' do diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index fbb20d77..c504b804 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -39,6 +39,7 @@ describe 'cloud::compute::hypervisor' do neutron_endpoint => '10.0.0.1', neutron_region_name => 'MyRegion', neutron_password => 'secrete', + memcache_servers => ['10.0.0.1','10.0.0.2'], log_facility => 'LOG_LOCAL0' } class { 'cloud::telemetry': ceilometer_secret => 'secrete', @@ -78,11 +79,13 @@ describe 'cloud::compute::hypervisor' do :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', :rabbit_virtual_host => '/', + :memcached_servers => ['10.0.0.1','10.0.0.2'], :database_connection => 'mysql://nova:secrete@10.0.0.1/nova?charset=utf8', :glance_api_servers => 'http://10.0.0.1:9292' ) should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true) should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone') + should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc') end it 'configure neutron on compute node' do