From 7d45133d37442e1bfee2666665203142f949d676 Mon Sep 17 00:00:00 2001 From: Aimon Bustardo Date: Tue, 6 Nov 2012 21:23:46 -0800 Subject: [PATCH 1/3] Make Horiuzon installation optional --- manifests/all.pp | 18 +++++++++++------- manifests/controller.pp | 20 ++++++++++++-------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/manifests/all.pp b/manifests/all.pp index 9c4b403..a733c54 100644 --- a/manifests/all.pp +++ b/manifests/all.pp @@ -34,6 +34,7 @@ # [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'. # [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 # # class { 'openstack::all': @@ -108,6 +109,7 @@ class openstack::all ( # Rabbit $rabbit_user = 'nova', # Horizon + $horizon = true, $cache_server_ip = '127.0.0.1', $cache_server_port = '11211', $swift = false, @@ -369,13 +371,15 @@ class openstack::all ( } ######## 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, + 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, + } } } diff --git a/manifests/controller.pp b/manifests/controller.pp index 0cae84d..a012cd2 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -35,6 +35,7 @@ # [secret_key] secret key to encode cookies, … # [cache_server_ip] local memcached instance ip # [cache_server_port] local memcached instance port +# [horizon] (bool) is horizon installed. Defaults to: true # [swift] (bool) is swift 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. @@ -48,7 +49,7 @@ # # class { 'openstack::controller': # public_address => '192.168.0.3', -# mysql_root_password => 'changeme', +# mysql_root_password => 'chanhorizon, # allowed_hosts => ['127.0.0.%', '192.168.1.%'], # admin_email => 'my_email@mw.com', # admin_password => 'my_admin_password', @@ -117,6 +118,7 @@ class openstack::controller ( # Rabbit $rabbit_user = 'nova', # Horizon + $horizon = true, $cache_server_ip = '127.0.0.1', $cache_server_port = '11211', $horizon_app_links = undef, @@ -295,13 +297,15 @@ class openstack::controller ( ######## 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, + 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, + } } } From 2283204d0ce8eac236b46117b31978e19f2b0b05 Mon Sep 17 00:00:00 2001 From: Aimon Bustardo Date: Tue, 6 Nov 2012 21:26:25 -0800 Subject: [PATCH 2/3] typo --- manifests/controller.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/controller.pp b/manifests/controller.pp index a012cd2..eca4d8f 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -49,7 +49,7 @@ # # class { 'openstack::controller': # public_address => '192.168.0.3', -# mysql_root_password => 'chanhorizon, +# mysql_root_password => 'changeme, # allowed_hosts => ['127.0.0.%', '192.168.1.%'], # admin_email => 'my_email@mw.com', # admin_password => 'my_admin_password', From e9d544721d00a1be346d0d16ebf7c56b8533dab3 Mon Sep 17 00:00:00 2001 From: Aimon Bustardo Date: Tue, 6 Nov 2012 21:27:41 -0800 Subject: [PATCH 3/3] typo --- manifests/controller.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/controller.pp b/manifests/controller.pp index eca4d8f..6e750db 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -49,7 +49,7 @@ # # class { 'openstack::controller': # public_address => '192.168.0.3', -# mysql_root_password => 'changeme, +# mysql_root_password => 'changeme', # allowed_hosts => ['127.0.0.%', '192.168.1.%'], # admin_email => 'my_email@mw.com', # admin_password => 'my_admin_password',