apply some changes suggested by Emilien
https://github.com/enovance/puppet-cloud/pull/121
This commit is contained in:
@@ -86,9 +86,6 @@ class cloud::dashboard(
|
|||||||
# We force $api_eth to avoid this situation
|
# We force $api_eth to avoid this situation
|
||||||
fqdn => $api_eth,
|
fqdn => $api_eth,
|
||||||
bind_address => $api_eth,
|
bind_address => $api_eth,
|
||||||
# TODO(Gonéri) disabling cache so far:
|
|
||||||
# https://github.com/enovance/puppet-cloud/pull/121
|
|
||||||
# cache_server_ip => $api_eth,
|
|
||||||
swift => true,
|
swift => true,
|
||||||
keystone_url => $keystone_url,
|
keystone_url => $keystone_url,
|
||||||
django_debug => $debug
|
django_debug => $debug
|
||||||
|
@@ -41,7 +41,6 @@ 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',
|
||||||
:cache_server_ip => '10.0.0.1',
|
|
||||||
:swift => true,
|
:swift => true,
|
||||||
:keystone_url => 'http://keystone.openstack.org:5000/v2.0',
|
:keystone_url => 'http://keystone.openstack.org:5000/v2.0',
|
||||||
:django_debug => true
|
:django_debug => true
|
||||||
@@ -54,7 +53,6 @@ describe 'cloud::dashboard' do
|
|||||||
{ :osfamily => 'Debian',
|
{ :osfamily => 'Debian',
|
||||||
:operatingsystem => 'Ubuntu',
|
:operatingsystem => 'Ubuntu',
|
||||||
:operatingsystemrelease => '12.04',
|
:operatingsystemrelease => '12.04',
|
||||||
:memorysize => '1000 MB',
|
|
||||||
:processorcount => '1',
|
:processorcount => '1',
|
||||||
:concat_basedir => '/var/lib/puppet/concat' }
|
:concat_basedir => '/var/lib/puppet/concat' }
|
||||||
end
|
end
|
||||||
@@ -66,7 +64,6 @@ describe 'cloud::dashboard' do
|
|||||||
let :facts do
|
let :facts do
|
||||||
{ :osfamily => 'RedHat',
|
{ :osfamily => 'RedHat',
|
||||||
:operatingsystemrelease => '6',
|
:operatingsystemrelease => '6',
|
||||||
:memorysize => '1000 MB',
|
|
||||||
:processorcount => '1',
|
:processorcount => '1',
|
||||||
:concat_basedir => '/var/lib/puppet/concat' }
|
:concat_basedir => '/var/lib/puppet/concat' }
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user