stackforge/puppet-openstack
Code Issues Proposed changes

Merge pull request #128 from aimonb/optional_horizon

Browse Source 
Make Horizon installation optional
This commit is contained in:
Dan Bode
2012-11-06 23:31:42 -08:00
parent 02fc41294e e9d544721d
commit b0e290682c
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/all.pp
View File

@@ -34,6 +34,7 @@
# [purge_nova_config] Whether unmanaged nova.conf entries should be purged. Optional. Defaults to true. # [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'. # [libvirt_type] The virualization type being controlled by libvirt. Optional. Defaults to 'kvm'.
# [nova_volume] The name of the volume group to use for nova volume allocation. Optional. Defaults to 'nova-volumes'. # [nova_volume] The name of the volume group to use for nova volume allocation. Optional. Defaults to 'nova-volumes'.
# [horizon] (bool) is horizon installed. Defaults to: true
# === Examples # === Examples
# #
# class { 'openstack::all': # class { 'openstack::all':
@@ -108,6 +109,7 @@ class openstack::all (
# Rabbit # Rabbit
$rabbit_user = 'nova', $rabbit_user = 'nova',
# Horizon # Horizon
$horizon = true,
$cache_server_ip = '127.0.0.1', $cache_server_ip = '127.0.0.1',
$cache_server_port = '11211', $cache_server_port = '11211',
$swift = false, $swift = false,
@@ -369,13 +371,15 @@ class openstack::all (
} }
######## Horizon ######## ######## Horizon ########
class { 'openstack::horizon': if ($horizon) {
secret_key => $secret_key, class { 'openstack::horizon':
cache_server_ip => $cache_server_ip, secret_key => $secret_key,
cache_server_port => $cache_server_port, cache_server_ip => $cache_server_ip,
swift => $swift, cache_server_port => $cache_server_port,
quantum => $quantum, swift => $swift,
horizon_app_links => $horizon_app_links, quantum => $quantum,
horizon_app_links => $horizon_app_links,
}
} }
} }

18
manifests/controller.pp
View File

@@ -35,6 +35,7 @@
# [secret_key] secret key to encode cookies, … # [secret_key] secret key to encode cookies, …
# [cache_server_ip] local memcached instance ip # [cache_server_ip] local memcached instance ip
# [cache_server_port] local memcached instance port # [cache_server_port] local memcached instance port
# [horizon] (bool) is horizon installed. Defaults to: true
# [swift] (bool) is swift installed # [swift] (bool) is swift installed
# [quantum] (bool) is quantum installed # [quantum] (bool) is quantum installed
# The next is an array of arrays, that can be used to add call-out links to the dashboard for other apps. # The next is an array of arrays, that can be used to add call-out links to the dashboard for other apps.
@@ -117,6 +118,7 @@ class openstack::controller (
# Rabbit # Rabbit
$rabbit_user = 'nova', $rabbit_user = 'nova',
# Horizon # Horizon
$horizon = true,
$cache_server_ip = '127.0.0.1', $cache_server_ip = '127.0.0.1',
$cache_server_port = '11211', $cache_server_port = '11211',
$horizon_app_links = undef, $horizon_app_links = undef,
@@ -295,13 +297,15 @@ class openstack::controller (
######## Horizon ######## ######## Horizon ########
class { 'openstack::horizon': if ($horizon) {
secret_key => $secret_key, class { 'openstack::horizon':
cache_server_ip => $cache_server_ip, secret_key => $secret_key,
cache_server_port => $cache_server_port, cache_server_ip => $cache_server_ip,
swift => $swift, cache_server_port => $cache_server_port,
quantum => $quantum, swift => $swift,
horizon_app_links => $horizon_app_links, quantum => $quantum,
horizon_app_links => $horizon_app_links,
}
} }
} }