Cleanup options deprecated for mitaka

Some options have been deprecated for Mitaka, replace them with the new
variants.

Change-Id: I98e8e82668501a34f27f38f9c9a8770d63ee3604
This commit is contained in:
Mark Vanderwiel 2016-04-13 14:11:46 -05:00
parent 5d70ac53fa
commit d6d787d4b9
4 changed files with 13 additions and 7 deletions

View File

@ -18,8 +18,8 @@
#
default['openstack']['orchestration']['conf']['DEFAULT']['log_dir'] = '/var/log/heat'
default['openstack']['orchestration']['conf']['DEFAULT']['notification_driver'] = 'heat.openstack.common.notifier.rpc_notifier'
default['openstack']['orchestration']['conf']['keystone_authtoken']['auth_plugin'] = 'v2password'
default['openstack']['orchestration']['conf']['oslo_messaging_notifications']['driver'] = 'heat.openstack.common.notifier.rpc_notifier'
default['openstack']['orchestration']['conf']['keystone_authtoken']['auth_type'] = 'v2password'
default['openstack']['orchestration']['conf']['keystone_authtoken']['username'] = 'heat'
default['openstack']['orchestration']['conf']['keystone_authtoken']['tenant_name'] = 'service'
default['openstack']['orchestration']['conf']['trustee']['auth_plugin'] = 'v2password'

View File

@ -10,7 +10,7 @@ describe 'openstack-orchestration::api-cfn' do
include_context 'orchestration_stubs'
include_examples 'expect runs openstack orchestration common recipe'
it 'installs heat cfn packages' do
it 'installs heat cfn packages' do
['openstack-heat-api-cfn', 'python-heatclient'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end

View File

@ -38,7 +38,7 @@ describe 'openstack-orchestration::identity_registration' do
end
it 'register heat orchestration endpoint with custom region override' do
node.set['openstack']['network']['region'] = 'region123'
node.set['openstack']['orchestration']['conf']['DEFAULT']['region_name_for_services'] = 'region123'
expect(chef_run).to create_endpoint_openstack_identity_register(
'Register Heat Orchestration Endpoint'
@ -47,7 +47,6 @@ describe 'openstack-orchestration::identity_registration' do
auth_uri: 'http://127.0.0.1:35357/v2.0',
bootstrap_token: 'bootstrap-token',
service_type: 'orchestration',
endpoint_region: 'RegionOne',
endpoint_adminurl: 'http://127.0.0.1:8004/v1/%(tenant_id)s',
endpoint_internalurl: 'http://127.0.0.1:8004/v1/%(tenant_id)s',
endpoint_publicurl: 'http://127.0.0.1:8004/v1/%(tenant_id)s',

View File

@ -133,13 +133,20 @@ shared_examples 'expects to create heat conf' do
%r{^heat_waitcondition_server_url = http://127.0.0.1:8000/v1/waitcondition$},
%r{^heat_watch_server_url = http://127.0.0.1:8003$},
%r{^log_dir = /var/log/heat$},
/^notification_driver = heat.openstack.common.notifier.rpc_notifier$/,
/^region_name_for_services = RegionOne$/
].each do |line|
expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', line)
end
end
it 'has oslo_messaging_notifications conf values' do
[
/^driver = heat.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
it 'has heat_api binding' do
[
/^bind_host = 127.0.0.1$/,
@ -200,7 +207,7 @@ shared_examples 'expects to create heat conf' do
it 'has default keystone_authtoken values' do
[
%r{^auth_url = http://127.0.0.1:5000/v2.0$},
/^auth_plugin = v2password$/,
/^auth_type = v2password$/,
/^username = heat$/,
/^tenant_name = service$/,
/^password = heat-pass$/