stackforge/puppet-openstack
Code Issues Proposed changes

revert optional horizon for separate pull requests

Browse Source
This commit is contained in:
Aimon Bustardo
2012-11-06 21:00:54 -08:00
parent 843a2e0aef
commit 9b052cd5fe
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/controller.pp
View File

@@ -38,7 +38,6 @@
# [cache_server_port] local memcached instance port
# [swift] (bool) is swift installed
# [quantum] (bool) is quantum installed
# [horizon] (bool) is horizon installed
# The next is an array of arrays, that can be used to add call-out links to the dashboard for other apps.
# There is no specific requirement for these apps to be for monitoring, that's just the defacto purpose.
# Each app is defined in two parts, the display name, and the URI
@@ -120,7 +119,6 @@ class openstack::controller (
$rabbit_user = 'nova',
$rabbit_virtual_host = '/',
# Horizon
$horizon = true,
$cache_server_ip = '127.0.0.1',
$cache_server_port = '11211',
$horizon_app_links = undef,
@@ -300,15 +298,13 @@ class openstack::controller (
######## Horizon ########
if ($horizon) {
class { 'openstack::horizon':
secret_key => $secret_key,
cache_server_ip => $cache_server_ip,
cache_server_port => $cache_server_port,
swift => $swift,
quantum => $quantum,
horizon_app_links => $horizon_app_links,
}
class { 'openstack::horizon':
secret_key => $secret_key,
cache_server_ip => $cache_server_ip,
cache_server_port => $cache_server_port,
swift => $swift,
quantum => $quantum,
horizon_app_links => $horizon_app_links,
}
}