diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index b78947ea6..6d99411b6 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -196,7 +196,7 @@ class tripleo::profile::base::glance::api ( "${backend_config[0]}:${backend_config[1]['GlanceBackend']}" } - $enabled_backends = ["${glance_backend_id}:${glance_backend}", 'http:http'] + $multistore_backends + $enabled_backends = ["${glance_backend_id}:${glance_backend}"] + $multistore_backends include glance include glance::config diff --git a/spec/classes/tripleo_profile_base_glance_api_spec.rb b/spec/classes/tripleo_profile_base_glance_api_spec.rb index 58f85e24e..ec8663262 100644 --- a/spec/classes/tripleo_profile_base_glance_api_spec.rb +++ b/spec/classes/tripleo_profile_base_glance_api_spec.rb @@ -101,7 +101,7 @@ describe 'tripleo::profile::base::glance::api' do is_expected.to contain_class('glance::config') is_expected.to contain_class('glance::api::logging') is_expected.to contain_class('glance::api').with( - :enabled_backends => ['default_backend:swift', 'http:http'], + :enabled_backends => ['default_backend:swift'], :default_backend => 'default_backend', ) is_expected.to_not contain_class('tripleo::profile::base::glance::backend::cinder') @@ -147,7 +147,6 @@ describe 'tripleo::profile::base::glance::api' do is_expected.to contain_class('glance::api').with( :enabled_backends => [ 'my_cinder:cinder', - 'http:http', 'my_file:file', 'rbd1:rbd', 'rbd2:rbd',