Merge "Ensure options for domain specific drivers are purged by default"
This commit is contained in:
commit
4fcb7548aa
|
@ -725,5 +725,10 @@ class keystone(
|
||||||
'identity/domain_specific_drivers_enabled': value => true;
|
'identity/domain_specific_drivers_enabled': value => true;
|
||||||
'identity/domain_config_dir': value => $domain_config_directory;
|
'identity/domain_config_dir': value => $domain_config_directory;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
keystone_config {
|
||||||
|
'identity/domain_specific_drivers_enabled': ensure => absent;
|
||||||
|
'identity/domain_config_dir': ensure => absent;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,6 +81,9 @@ describe 'keystone' do
|
||||||
:heartbeat_in_pthread => '<SERVICE DEFAULT>',
|
:heartbeat_in_pthread => '<SERVICE DEFAULT>',
|
||||||
:amqp_durable_queues => '<SERVICE DEFAULT>',
|
:amqp_durable_queues => '<SERVICE DEFAULT>',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
is_expected.to contain_keystone_config('identity/domain_specific_drivers_enabled').with_ensure('absent')
|
||||||
|
is_expected.to contain_keystone_config('identity/domain_config_dir').with_ensure('absent')
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_service('keystone').with(
|
it { is_expected.to contain_service('keystone').with(
|
||||||
|
|
Loading…
Reference in New Issue