stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #381 from dsavineau/bug/380/dsavineau

Browse Source 
Support servername in cloud::dashboard
This commit is contained in:
Emilien Macchi
2014-03-26 09:26:30 +01:00
parent bb329becb2 9d7c63b03b
commit d4facd879f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/dashboard.pp
View File

@@ -36,6 +36,10 @@
# (optional) Which interface we bind the Horizon server. # (optional) Which interface we bind the Horizon server.
# Default value in params # Default value in params
# #
# [*servername*]
# (optional) DNS name used to connect to Openstack Dashboard.
# Default value fqdn.
#
# [*listen_ssl*] # [*listen_ssl*]
# (optional) Enable SSL on OpenStack Dashboard vhost # (optional) Enable SSL on OpenStack Dashboard vhost
# It requires SSL files (keys and certificates) # It requires SSL files (keys and certificates)
@@ -75,6 +79,7 @@ class cloud::dashboard(
$secret_key = $os_params::secret_key, $secret_key = $os_params::secret_key,
$horizon_port = $os_params::horizon_port, $horizon_port = $os_params::horizon_port,
$api_eth = $os_params::api_eth, $api_eth = $os_params::api_eth,
$servername = $::fqdn,
$listen_ssl = false, $listen_ssl = false,
$keystone_host = $os_params::ks_keystone_internal_host, $keystone_host = $os_params::ks_keystone_internal_host,
$keystone_proto = $os_params::ks_keystone_internal_proto, $keystone_proto = $os_params::ks_keystone_internal_proto,
@@ -96,6 +101,7 @@ class cloud::dashboard(
# e.g: 127.0.0.1 instead of a public IP address. # e.g: 127.0.0.1 instead of a public IP address.
# We force $api_eth to avoid this situation # We force $api_eth to avoid this situation
fqdn => $api_eth, fqdn => $api_eth,
servername => $servername,
bind_address => $api_eth, bind_address => $api_eth,
swift => true, swift => true,
keystone_url => $keystone_url, keystone_url => $keystone_url,

4
spec/classes/cloud_dashboard_spec.rb
View File

@@ -31,7 +31,8 @@ describe 'cloud::dashboard' do
:keystone_proto => 'http', :keystone_proto => 'http',
:keystone_port => '5000', :keystone_port => '5000',
:debug => true, :debug => true,
:api_eth => '10.0.0.1' } :api_eth => '10.0.0.1',
:servername => 'horizon.openstack.org' }
end end
it 'configure horizon' do it 'configure horizon' do
@@ -41,6 +42,7 @@ describe 'cloud::dashboard' do
:can_set_mount_point => 'False', :can_set_mount_point => 'False',
:fqdn => '10.0.0.1', :fqdn => '10.0.0.1',
:bind_address => '10.0.0.1', :bind_address => '10.0.0.1',
:servername => 'horizon.openstack.org',
:swift => true, :swift => true,
:cache_server_ip => false, :cache_server_ip => false,
:keystone_url => 'http://keystone.openstack.org:5000/v2.0', :keystone_url => 'http://keystone.openstack.org:5000/v2.0',