diff --git a/manifests/ldap_backend.pp b/manifests/ldap_backend.pp index 999e1603c..2f4d5d73b 100644 --- a/manifests/ldap_backend.pp +++ b/manifests/ldap_backend.pp @@ -459,6 +459,7 @@ define keystone::ldap_backend( ) { include ::keystone::deps + include ::keystone $domain_enabled = getparam(Keystone_config['identity/domain_specific_drivers_enabled'], 'value') $domain_dir_enabled = getparam(Keystone_config['identity/domain_config_dir'], 'value') diff --git a/spec/defines/keystone_ldap_backend_spec.rb b/spec/defines/keystone_ldap_backend_spec.rb index ddd0d9683..62267cc9f 100644 --- a/spec/defines/keystone_ldap_backend_spec.rb +++ b/spec/defines/keystone_ldap_backend_spec.rb @@ -1,10 +1,15 @@ require 'spec_helper' describe 'keystone::ldap_backend' do + let :facts do + @default_facts.merge({ :osfamily => 'Debian' }) + end describe 'Using Default domain' do let(:title) { 'Default' } + let(:pre_condition) do <<-EOM + class { '::keystone': admin_token => 'token'} keystone_config {'identity/domain_specific_drivers_enabled': value => true} keystone_config {'identity/domain_config_dir': value => '/etc/keystone/domains'} file {'/etc/keystone/keystone.conf': ensure => present } @@ -204,6 +209,7 @@ describe 'keystone::ldap_backend' do end let(:pre_condition) do <<-EOM + class { '::keystone': admin_token => 'token'} keystone_config {'identity/domain_specific_drivers_enabled': value => true} keystone_config {'identity/domain_config_dir': value => '/etc/keystone/domains'} file {'/etc/keystone/keystone.conf': ensure => present } @@ -220,6 +226,7 @@ describe 'keystone::ldap_backend' do context 'Missing identity/domain_specific_drivers_enabled' do let(:pre_condition) do <<-EOM + class { '::keystone': admin_token => 'token'} keystone_config {'identity/domain_config_dir': value => '/etc/keystone/domains'} file {'/etc/keystone/keystone.conf': ensure => present } EOM @@ -230,6 +237,7 @@ describe 'keystone::ldap_backend' do context 'Missing identity/domain_config_dir' do let(:pre_condition) do <<-EOM + class { '::keystone': admin_token => 'token'} keystone_config {'identity/domain_specific_drivers_enabled': value => true} file {'/etc/keystone/keystone.conf': ensure => present } EOM