Cleanup options deprecated for mitaka
Some options have been deprecated for Mitaka, replace them with the new variants. Change-Id: I7563c8cac90d9caa0095944d8c0835d73f1b8dde
This commit is contained in:
parent
6ce1eb3be6
commit
37a4707015
|
@ -1,6 +1,6 @@
|
|||
default['openstack']['block-storage']['conf_secrets'] = {}
|
||||
default['openstack']['block-storage']['conf'].tap do |conf|
|
||||
conf['DEFAULT']['notification_driver'] = 'cinder.openstack.common.notifier.rpc_notifier'
|
||||
conf['oslo_messaging_notifications']['driver'] = 'cinder.openstack.common.notifier.rpc_notifier'
|
||||
if node['openstack']['block-storage']['syslog']['use']
|
||||
conf['DEFAULT']['log_config'] = '/etc/openstack/logging.conf'
|
||||
end
|
||||
|
@ -9,7 +9,7 @@ default['openstack']['block-storage']['conf'].tap do |conf|
|
|||
conf['DEFAULT']['control_exchange'] = 'cinder'
|
||||
conf['DEFAULT']['volume_group'] = 'cinder-volumes'
|
||||
conf['DEFAULT']['state_path'] = '/var/lib/cinder'
|
||||
conf['keystone_authtoken']['auth_plugin'] = 'v2password'
|
||||
conf['keystone_authtoken']['auth_type'] = 'v2password'
|
||||
conf['keystone_authtoken']['region_name'] = node['openstack']['region']
|
||||
conf['keystone_authtoken']['username'] = 'cinder'
|
||||
conf['keystone_authtoken']['tenant_name'] = 'service'
|
||||
|
|
|
@ -12,8 +12,7 @@ describe 'openstack-block-storage::api' do
|
|||
|
||||
include_context 'block-storage-stubs'
|
||||
include_examples 'common-logging'
|
||||
|
||||
expect_creates_cinder_conf 'service[cinder-api]', 'cinder', 'cinder'
|
||||
include_examples 'creates_cinder_conf', 'service[cinder-api]', 'cinder', 'cinder'
|
||||
|
||||
it 'upgrades cinder api packages' do
|
||||
expect(chef_run).to upgrade_package('cinder-api')
|
||||
|
|
|
@ -12,8 +12,7 @@ describe 'openstack-block-storage::scheduler' do
|
|||
|
||||
include_context 'block-storage-stubs'
|
||||
include_examples 'common-logging'
|
||||
|
||||
expect_creates_cinder_conf 'service[cinder-scheduler]', 'cinder', 'cinder'
|
||||
include_examples 'creates_cinder_conf', 'service[cinder-scheduler]', 'cinder', 'cinder'
|
||||
|
||||
it 'upgrades cinder scheduler package' do
|
||||
expect(chef_run).to upgrade_package 'cinder-scheduler'
|
||||
|
|
|
@ -90,7 +90,7 @@ def expect_runs_openstack_common_logging_recipe
|
|||
end
|
||||
end
|
||||
|
||||
def expect_creates_cinder_conf(service, user, group, action = :restart)
|
||||
shared_examples 'creates_cinder_conf' do |service, user, group, action = :restart|
|
||||
describe 'cinder.conf' do
|
||||
let(:file) { chef_run.template('/etc/cinder/cinder.conf') }
|
||||
|
||||
|
@ -105,5 +105,28 @@ def expect_creates_cinder_conf(service, user, group, action = :restart)
|
|||
it 'notifies service restart' do
|
||||
expect(file).to notify(service).to(action)
|
||||
end
|
||||
|
||||
it do
|
||||
[
|
||||
/^auth_type = v2password$/,
|
||||
/^region_name = RegionOne$/,
|
||||
/^username = cinder/,
|
||||
/^tenant_name = service$/,
|
||||
%r{^signing_dir = /var/cache/cinder/api$},
|
||||
%r{^auth_url = http://127.0.0.1:5000/v2.0$},
|
||||
/^password = cinder-pass$/
|
||||
].each do |line|
|
||||
expect(chef_run).to render_config_file(file.name)
|
||||
.with_section_content('keystone_authtoken', line)
|
||||
end
|
||||
end
|
||||
|
||||
it 'has oslo_messaging_notifications conf values' do
|
||||
[
|
||||
/^driver = cinder.openstack.common.notifier.rpc_notifier$/
|
||||
].each do |line|
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_notifications', line)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -12,8 +12,7 @@ describe 'openstack-block-storage::volume' do
|
|||
|
||||
include_context 'block-storage-stubs'
|
||||
include_examples 'common-logging'
|
||||
|
||||
expect_creates_cinder_conf('service[cinder-volume]', 'cinder', 'cinder')
|
||||
include_examples 'creates_cinder_conf', 'service[cinder-volume]', 'cinder', 'cinder'
|
||||
|
||||
it 'upgrades cinder volume packages' do
|
||||
expect(chef_run).to upgrade_package 'cinder-volume'
|
||||
|
|
Loading…
Reference in New Issue