stackforge/puppet-openstack
Code Issues Proposed changes

updates based on pull request

Browse Source
This commit is contained in:
Robert Starmer
2012-06-12 07:40:09 +00:00
parent 73c1ac6a97
commit e6c3608480
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/controller.pp
View File

@@ -35,6 +35,10 @@
# [cache_server_port] local memcached instance port # [cache_server_port] local memcached instance port
# [swift] (bool) is swift installed # [swift] (bool) is swift installed
# [quantum] (bool) is quqntum installed # [quantum] (bool) is quqntum 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
# [horizon_app_links] array as in '[ ["Nagios","http://nagios_addr:port/path"],["Ganglia","http://ganglia_addr"] ]'
# #
class openstack::controller( class openstack::controller(
# my address # my address
@@ -75,9 +79,7 @@ class openstack::controller(
$cache_server_port = '11211', $cache_server_port = '11211',
$swift = false, $swift = false,
$quantum = false, $quantum = false,
$app_mon = undef, $horizon_app_links = false,
$comp_mon = undef,
$stor_mon = undef,
) { ) {
$glance_api_servers = "${internal_address}:9292" $glance_api_servers = "${internal_address}:9292"
@@ -278,9 +280,7 @@ class openstack::controller(
cache_server_port => $cache_server_port, cache_server_port => $cache_server_port,
swift => $swift, swift => $swift,
quantum => $quantum, quantum => $quantum,
app_mon => $app_mon, horizon_app_links => $horizon_app_links,
comp_mon => $comp_mon,
stor_mon => $stor_mon,
} }