stackforge/puppet-openstack-cloud
Code Issues Proposed changes

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

Browse Source 
Fix lint issues, and disable compute tests
This commit is contained in:
Emilien Macchi
2014-02-17 17:56:44 +01:00
parent 29bfae452e 3f7763ac30
commit 50b6b10248
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/dashboard.pp
View File

@@ -79,12 +79,12 @@ class cloud::dashboard(
# fqdn can can be ambiguous since we use reverse DNS here, # fqdn can can be ambiguous since we use reverse DNS here,
# 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,
bind_address => $api_eth, bind_address => $api_eth,
swift => true, swift => true,
keystone_url => $keystone_url, keystone_url => $keystone_url,
cache_server_ip => false, cache_server_ip => false,
django_debug => $debug django_debug => $debug
} }

4
spec/classes/cloud_compute_controller_spec.rb
View File

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