From 7fd66c0c1a5bbcbc635ab9e8f16852be82bf02e9 Mon Sep 17 00:00:00 2001 From: Rhys Oxenham Date: Fri, 7 Feb 2014 10:05:02 +0000 Subject: [PATCH 1/2] Configure qpid_hostname for Controller host groups The default controller common manifest assumes that qpid is running locally on the same machine. This may or may not be the case and therefore it should take the '$qpid_host' parameter used within other manifests. Without this change, Nova attempts to use localhost as it's qpid broker, which obviously breaks if using multiple controller hosts. --- puppet/modules/quickstack/manifests/controller_common.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/puppet/modules/quickstack/manifests/controller_common.pp b/puppet/modules/quickstack/manifests/controller_common.pp index 3cf54a43..32b96b4b 100644 --- a/puppet/modules/quickstack/manifests/controller_common.pp +++ b/puppet/modules/quickstack/manifests/controller_common.pp @@ -116,6 +116,7 @@ image_service => 'nova.image.glance.GlanceImageService', glance_api_servers => "http://${controller_priv_host}:9292/v1", rpc_backend => 'nova.openstack.common.rpc.impl_qpid', + qpid_hostname => $qpid_host, verbose => $verbose, require => Class['openstack::db::mysql', 'qpid::server'], } From a3a0c00f5f6b451f1d40f33c02455c0ba3c6c4b4 Mon Sep 17 00:00:00 2001 From: Rhys Oxenham Date: Mon, 10 Feb 2014 15:05:08 +0000 Subject: [PATCH 2/2] Adds section for memcached settings in manifests The current manifests do not offer the user the chance to override the default memcached settings. It always defaults to the localhost. This change updates the manifests to allow the user to override. Note that we'll need to update the installer packages to set a default override parameter. --- puppet/modules/quickstack/manifests/controller_common.pp | 8 ++++++-- puppet/modules/quickstack/manifests/neutron/controller.pp | 4 ++++ puppet/modules/quickstack/manifests/params.pp | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/puppet/modules/quickstack/manifests/controller_common.pp b/puppet/modules/quickstack/manifests/controller_common.pp index 32b96b4b..eef2b162 100644 --- a/puppet/modules/quickstack/manifests/controller_common.pp +++ b/puppet/modules/quickstack/manifests/controller_common.pp @@ -2,6 +2,8 @@ class quickstack::controller_common ( $admin_email = $quickstack::params::admin_email, $admin_password = $quickstack::params::admin_password, + $cache_server_ip = $quickstack::params::cache_server_ip, + $cache_server_port = $quickstack::params::cache_server_port, $ceilometer_metering_secret = $quickstack::params::ceilometer_metering_secret, $ceilometer_user_password = $quickstack::params::ceilometer_user_password, $cinder_backend_gluster = $quickstack::params::cinder_backend_gluster, @@ -203,8 +205,10 @@ } class {'horizon': - secret_key => $horizon_secret_key, - keystone_host => $controller_priv_host, + secret_key => $horizon_secret_key, + keystone_host => $controller_priv_host, + cache_server_ip => $cache_server_ip, + cache_server_port => $cache_server_port, } class {'memcached':} diff --git a/puppet/modules/quickstack/manifests/neutron/controller.pp b/puppet/modules/quickstack/manifests/neutron/controller.pp index a52b0e0c..ef7cd7e8 100644 --- a/puppet/modules/quickstack/manifests/neutron/controller.pp +++ b/puppet/modules/quickstack/manifests/neutron/controller.pp @@ -2,6 +2,8 @@ class quickstack::neutron::controller ( $admin_email = $quickstack::params::admin_email, $admin_password = $quickstack::params::admin_password, + $cache_server_ip = $quickstack::params::cache_server_ip, + $cache_server_port = $quickstack::params::cache_server_port, $ceilometer_metering_secret = $quickstack::params::ceilometer_metering_secret, $ceilometer_user_password = $quickstack::params::ceilometer_user_password, $cinder_backend_gluster = $quickstack::params::cinder_backend_gluster, @@ -58,6 +60,8 @@ class { 'quickstack::controller_common': admin_email => $admin_email, admin_password => $admin_password, + cache_server_ip => $cache_server_ip, + cache_server_port => $cache_server_port, ceilometer_metering_secret => $ceilometer_metering_secret, ceilometer_user_password => $ceilometer_user_password, cinder_backend_gluster => $cinder_backend_gluster, diff --git a/puppet/modules/quickstack/manifests/params.pp b/puppet/modules/quickstack/manifests/params.pp index edbc1702..b48d7458 100644 --- a/puppet/modules/quickstack/manifests/params.pp +++ b/puppet/modules/quickstack/manifests/params.pp @@ -102,4 +102,8 @@ $mysql_shared_storage_type = 'MYSQL_SHARED_STORAGE_TYPE' $mysql_clu_member_addrs = 'SPACE_SEPARATED_IP_ADDRS' $mysql_resource_group_name = 'mysqlgroup' + + # Configure Memcached settings for Horizon + $cache_server_ip = '127.0.0.1' + $cache_server_port = '11211' }