Skip to content

Adds section for memcached settings in manifests #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rdoxenham wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adds section for memcached settings in manifests #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fd66c0
Configure qpid_hostname for Controller host groups
Feb 7, 2014
f7dd62c
Merge branch 'master' of https://github.com/rdoxenham/astapor
Feb 7, 2014
a3a0c00
Adds section for memcached settings in manifests
Feb 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions puppet/modules/quickstack/manifests/controller_common.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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':}
Expand Down
4 changes: 4 additions & 0 deletions puppet/modules/quickstack/manifests/neutron/controller.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions puppet/modules/quickstack/manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Member

@jguiditta jguiditta Feb 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order for the defaults to appear in foreman, these new variables would need to be in seeds.rb as well

$cache_server_port = '11211'
}