stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #667 from enovance/deprecate_horizon_fqdn

Browse Source 
dashboard: Deprecated fqdn parameter to horizon
This commit is contained in:
François Charlier 2014-10-08 14:37:42 +02:00
commit 52074c5dd5
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/dashboard.pp
View File

@ -115,10 +115,6 @@ class cloud::dashboard(
class { 'horizon': class { 'horizon':
secret_key => $secret_key, secret_key => $secret_key,
can_set_mount_point => 'False', can_set_mount_point => 'False',
# fqdn can can be ambiguous since we use reverse DNS here,
# e.g: 127.0.0.1 instead of a public IP address.
# We force $api_eth to avoid this situation
fqdn => $api_eth,
servername => $servername, servername => $servername,
bind_address => $api_eth, bind_address => $api_eth,
swift => true, swift => true,

2
spec/classes/cloud_dashboard_spec.rb
View File

@ -43,7 +43,6 @@ describe 'cloud::dashboard' do
:listen_ssl => false, :listen_ssl => false,
:secret_key => '/etc/ssl/secret', :secret_key => '/etc/ssl/secret',
:can_set_mount_point => 'False', :can_set_mount_point => 'False',
:fqdn => '10.0.0.1',
:bind_address => '10.0.0.1', :bind_address => '10.0.0.1',
:servername => 'horizon.openstack.org', :servername => 'horizon.openstack.org',
:swift => true, :swift => true,
@ -71,7 +70,6 @@ describe 'cloud::dashboard' do
:listen_ssl => false, :listen_ssl => false,
:secret_key => '/etc/ssl/secret', :secret_key => '/etc/ssl/secret',
:can_set_mount_point => 'False', :can_set_mount_point => 'False',
:fqdn => '10.0.0.1',
:bind_address => '10.0.0.1', :bind_address => '10.0.0.1',
:servername => 'horizon.openstack.org', :servername => 'horizon.openstack.org',
:swift => true, :swift => true,