Nova placement doesn't require nova::api

Dropping this check since Nova placement shouldn't need
nova::api to be present.

Change-Id: If943157b2b4afeb640919e77ef0214518e13ee15
This commit is contained in:
Dan Prince
2017-02-09 16:13:34 -05:00
parent 11179b33d3
commit 3e33a66628
2 changed files with 3 additions and 26 deletions

View File

@@ -72,10 +72,6 @@
# apache::vhost ssl parameters.
# Optional. Default to apache::vhost 'ssl_*' defaults.
#
# == Dependencies
#
# requires Class['apache'] & Class['nova'] & Class['nova::api']
#
# == Examples
#
# include apache
@@ -109,10 +105,6 @@ class nova::wsgi::apache_placement (
include ::apache::mod::ssl
}
if ! defined(Class[::nova::api]) {
fail('::nova::api class must be declared in composition layer.')
}
nova::generic_service { 'placement-api':
service_name => false,
package_name => $::nova::params::placement_package_name,

View File

@@ -15,9 +15,7 @@ describe 'nova::wsgi::apache_placement' do
class { '::nova::keystone::authtoken':
password => 'secrete',
}
class { '::nova::api':
service_name => 'httpd',
}"
"
end
shared_examples_for 'apache serving nova with mod_wsgi' do
@@ -33,9 +31,7 @@ describe 'nova::wsgi::apache_placement' do
class { '::nova::keystone::authtoken':
password => 'secrete',
}
class { '::nova::api':
service_name => 'httpd',
}"
"
end
it { is_expected.to contain_package('nova-placement-api').with(
@@ -103,9 +99,7 @@ describe 'nova::wsgi::apache_placement' do
class { '::nova::keystone::authtoken':
password => 'secrete',
}
class { '::nova::api':
service_name => 'httpd',
}"
"
end
let :params do
@@ -141,15 +135,6 @@ describe 'nova::wsgi::apache_placement' do
)}
end
describe 'when ::nova::api is missing in the composition layer' do
let :pre_condition do
"include nova"
end
it { is_expected.to raise_error Puppet::Error, /::nova::api class must be declared in composition layer./ }
end
end
on_supported_os({