Merge pull request #262 from enovance/bug/205/sbadia

Fix lint issues, and disable compute tests
This commit is contained in:
Emilien Macchi 2014-02-17 17:56:44 +01:00
commit 061f769b9c
2 changed files with 8 additions and 8 deletions

View File

@ -79,12 +79,12 @@ class cloud::dashboard(
# 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,
bind_address => $api_eth,
swift => true,
keystone_url => $keystone_url,
cache_server_ip => false,
django_debug => $debug
fqdn => $api_eth,
bind_address => $api_eth,
swift => true,
keystone_url => $keystone_url,
cache_server_ip => false,
django_debug => $debug
}

View File

@ -137,8 +137,8 @@ describe 'cloud::compute::controller' do
let :facts do
{ :osfamily => 'RedHat' }
end
it_configures 'openstack compute controller'
#TODO(sbadia) Wait https://review.openstack.org/#/c/72449/ in stable/havana
#it_configures 'openstack compute controller'
end
end