stackforge/puppet-openstack
Code Issues Proposed changes

Remove unneeded parameters

Browse Source 
This patch removes the swift and quantum parameters from the Horizon
manifest. They are not needed as Horizon pulls this information
dynamically from Keystone.

Change-Id: I125c33eed824587b8a21ccbe4bf04c8a332e29e4
This commit is contained in:
Joe Topjian
2013-05-14 13:39:11 -06:00
parent 2fc62f9e5e
commit 7bdab85f35
6 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/all.pp
View File

@@ -112,7 +112,6 @@ class openstack::all (
$horizon = true, $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,
$horizon_app_links = undef, $horizon_app_links = undef,
# if the cinder management components should be installed # if the cinder management components should be installed
$cinder = true, $cinder = true,
@@ -376,8 +375,6 @@ class openstack::all (
secret_key => $secret_key, secret_key => $secret_key,
cache_server_ip => $cache_server_ip, cache_server_ip => $cache_server_ip,
cache_server_port => $cache_server_port, cache_server_port => $cache_server_port,
swift => $swift,
quantum => $quantum,
horizon_app_links => $horizon_app_links, horizon_app_links => $horizon_app_links,
} }
} }

4
manifests/controller.pp
View File

@@ -39,7 +39,6 @@
# [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 # [horizon] (bool) is horizon installed. Defaults to: true
# [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.
# There is no specific requirement for these apps to be for monitoring, that's just the defacto purpose. # There is no specific requirement for these apps to be for monitoring, that's just the defacto purpose.
@@ -130,7 +129,6 @@ class openstack::controller (
$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,
$swift = false,
# VNC # VNC
$vnc_enabled = true, $vnc_enabled = true,
$vncproxy_host = false, $vncproxy_host = false,
@@ -324,8 +322,6 @@ class openstack::controller (
secret_key => $secret_key, secret_key => $secret_key,
cache_server_ip => $cache_server_ip, cache_server_ip => $cache_server_ip,
cache_server_port => $cache_server_port, cache_server_port => $cache_server_port,
swift => $swift,
quantum => $quantum,
horizon_app_links => $horizon_app_links, horizon_app_links => $horizon_app_links,
} }
} }

12
manifests/horizon.pp
View File

@@ -22,14 +22,6 @@
# (optional) Port that memcache server listens on. # (optional) Port that memcache server listens on.
# Defaults to '11211'. # Defaults to '11211'.
# #
# [*swift*]
# (optional) Whether the swift interface extension should be enabled in Horizon
# Defaults to false.
#
# [*quantum*]
# (optional) Whether the quantum interface extension should be enabled in Horizon
# Defaults to false.
#
# [*horizon_app_links*] # [*horizon_app_links*]
# (optional) External Monitoring links. # (optional) External Monitoring links.
# Defaults to undef. # Defaults to undef.
@@ -65,8 +57,6 @@ class openstack::horizon (
$secret_key, $secret_key,
$cache_server_ip = '127.0.0.1', $cache_server_ip = '127.0.0.1',
$cache_server_port = '11211', $cache_server_port = '11211',
$swift = false,
$quantum = false,
$horizon_app_links = undef, $horizon_app_links = undef,
$keystone_host = '127.0.0.1', $keystone_host = '127.0.0.1',
$keystone_scheme = 'http', $keystone_scheme = 'http',
@@ -85,8 +75,6 @@ class openstack::horizon (
cache_server_ip => $cache_server_ip, cache_server_ip => $cache_server_ip,
cache_server_port => $cache_server_port, cache_server_port => $cache_server_port,
secret_key => $secret_key, secret_key => $secret_key,
swift => $swift,
quantum => $quantum,
horizon_app_links => $horizon_app_links, horizon_app_links => $horizon_app_links,
keystone_host => $keystone_host, keystone_host => $keystone_host,
keystone_scheme => $keystone_scheme, keystone_scheme => $keystone_scheme,

2
spec/classes/openstack_all_spec.rb
View File

@@ -42,8 +42,6 @@ describe 'openstack::all' do
:secret_key => 'secret_key', :secret_key => 'secret_key',
:cache_server_ip => '127.0.0.1', :cache_server_ip => '127.0.0.1',
:cache_server_port => '11211', :cache_server_port => '11211',
:swift => false,
:quantum => false,
:horizon_app_links => false :horizon_app_links => false
) )
end end

2
spec/classes/openstack_controller_spec.rb
View File

@@ -403,8 +403,6 @@ describe 'openstack::controller' do
:secret_key => 'secret_key', :secret_key => 'secret_key',
:cache_server_ip => '127.0.0.1', :cache_server_ip => '127.0.0.1',
:cache_server_port => '11211', :cache_server_port => '11211',
:swift => false,
:quantum => false,
:horizon_app_links => false :horizon_app_links => false
) )
end end

2
spec/classes/openstack_horizon_spec.rb
View File

@@ -30,8 +30,6 @@ describe 'openstack::horizon' do
:cache_server_ip => '127.0.0.1', :cache_server_ip => '127.0.0.1',
:cache_server_port => '11211', :cache_server_port => '11211',
:secret_key => 'super_secret', :secret_key => 'super_secret',
:swift => false,
:quantum => false,
:horizon_app_links => false, :horizon_app_links => false,
:keystone_host => '127.0.0.1', :keystone_host => '127.0.0.1',
:keystone_scheme => 'http', :keystone_scheme => 'http',