stackforge/puppet-openstack-cloud
Code Issues Proposed changes

adjust for horizon wsgi changes

Browse Source 
puppet-horizon has now some wsgi_ parameters and the Debian
situation is resolved.
This commit is contained in:
Gonéri Le Bouder
2014-01-19 20:43:25 +01:00
parent 97ddf4ea31
commit b28613295a
1 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
manifests/dashboard.pp
View File

@@ -50,8 +50,11 @@ class cloud::dashboard(
$listen_ssl = false, $listen_ssl = false,
) { ) {
case $::osfamily { $supported = [ 'RedHat', 'Debian' ]
'RedHat': { if grep($supported, $::osfamily) != [$::osfamily] {
fail("module puppet-horizon doesn't support ${::osfamily}")
}
class {'horizon': class {'horizon':
secret_key => $secret_key, secret_key => $secret_key,
keystone_host => $ks_keystone_internal_host, keystone_host => $ks_keystone_internal_host,
@@ -59,31 +62,7 @@ class cloud::dashboard(
# fqdn can can be ambiguous since we use reverse DNS here, # fqdn can can be ambiguous since we use reverse DNS here,
# e.g: 127.0.0.1 instead of a public IP address. # e.g: 127.0.0.1 instead of a public IP address.
# We force $api_eth to avoid this situation # We force $api_eth to avoid this situation
fqdn => $api_eth fqdn => $api_eth,
}
}
'Debian': {
case $::operatingsystem {
'Debian': {
#FIXME(sbadia) https://review.openstack.org/#/c/64523/
fail('puppet-horizon does not work yet on Debian. Work in progress by https://review.openstack.org/#/c/64523/')
}
default: {
class {'horizon':
secret_key => $secret_key,
keystone_host => $ks_keystone_internal_host,
can_set_mount_point => 'False',
# fqdn can can be ambiguous since we use reverse DNS here,
# e.g: 127.0.0.1 instead of a public IP address.
# We force $api_eth to avoid this situation
fqdn => $api_eth
}
}
}
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module puppet-horizon only support osfamily RedHat and Debian")
}
} }
@@haproxy::balancermember{"${::fqdn}-horizon": @@haproxy::balancermember{"${::fqdn}-horizon":