Add the secret_key parameter to the Horizon class

This commit is contained in:
François Charlier
2012-07-10 20:01:45 +02:00
parent 4bb922483d
commit 4ddc4bc1b4
2 changed files with 12 additions and 5 deletions

View File

@@ -30,6 +30,7 @@
# [nova_user_password] The password of the keystone user for the nova service. Optional. Defaults to nova_pass'.
# [glance_db_password] The password for the db user for glance. Optional. Defaults to 'glance_pass'.
# [glance_user_password] The password of the glance service user. Optional. Defaults to 'glance_pass'.
# [secret_key] The secret key for horizon. Optional. Defaults to 'dummy_secret_key'.
# [verbose] If the services should log verbosely. Optional. Defaults to false.
# [purge_nova_config] Whether unmanaged nova.conf entries should be purged. Optional. Defaults to true.
# [libvirt_type] The virualization type being controlled by libvirt. Optional. Defaults to 'kvm'.
@@ -73,6 +74,7 @@ class openstack::all(
$nova_user_password = 'nova_pass',
$glance_db_password = 'glance_pass',
$glance_user_password = 'glance_pass',
$secret_key = 'dummy_secret_key',
# config
$verbose = false,
$auto_assign_floating_ip = false,
@@ -265,7 +267,9 @@ class openstack::all(
listen_ip => '127.0.0.1',
}
class { 'horizon': }
class { 'horizon':
secret_key => $secret_key,
}
######## End Horizon #####

View File

@@ -34,6 +34,7 @@
# [verbose] Rahter to log services at verbose.
# [export_resources] Rather to export resources.
# Horizon related config - assumes puppetlabs-horizon code
# [secret_key] secret key to encode cookies,
# [cache_server_ip] local memcached instance ip
# [cache_server_port] local memcached instance port
# [swift] (bool) is swift installed
@@ -81,6 +82,7 @@ class openstack::controller(
# I do not think that this needs a bridge?
$verbose = false,
$export_resources = true,
$secret_key = 'dummy_secret_key',
$cache_server_ip = '127.0.0.1',
$cache_server_port = '11211',
$swift = false,
@@ -309,6 +311,7 @@ class openstack::controller(
}
class { 'horizon':
secret_key => $secret_key,
cache_server_ip => $cache_server_ip,
cache_server_port => $cache_server_port,
swift => $swift,