Browse Source

Cleanup options deprecated for mitaka

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

Change-Id: I98e8e82668501a34f27f38f9c9a8770d63ee3604
Mark Vanderwiel 3 years ago
parent
commit
d6d787d4b9

+ 2
- 2
attributes/heat_conf.rb View File

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

+ 1
- 1
spec/api-cfn-redhat_spec.rb View File

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

+ 1
- 2
spec/identity_registration_spec.rb View File

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

+ 9
- 2
spec/spec_helper.rb View File

@@ -133,13 +133,20 @@ shared_examples 'expects to create heat conf' do
133 133
           %r{^heat_waitcondition_server_url = http://127.0.0.1:8000/v1/waitcondition$},
134 134
           %r{^heat_watch_server_url = http://127.0.0.1:8003$},
135 135
           %r{^log_dir = /var/log/heat$},
136
-          /^notification_driver = heat.openstack.common.notifier.rpc_notifier$/,
137 136
           /^region_name_for_services = RegionOne$/
138 137
         ].each do |line|
139 138
           expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', line)
140 139
         end
141 140
       end
142 141
 
142
+      it 'has oslo_messaging_notifications conf values' do
143
+        [
144
+          /^driver = heat.openstack.common.notifier.rpc_notifier$/
145
+        ].each do |line|
146
+          expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_notifications', line)
147
+        end
148
+      end
149
+
143 150
       it 'has heat_api binding' do
144 151
         [
145 152
           /^bind_host = 127.0.0.1$/,
@@ -200,7 +207,7 @@ shared_examples 'expects to create heat conf' do
200 207
       it 'has default keystone_authtoken values' do
201 208
         [
202 209
           %r{^auth_url = http://127.0.0.1:5000/v2.0$},
203
-          /^auth_plugin = v2password$/,
210
+          /^auth_type = v2password$/,
204 211
           /^username = heat$/,
205 212
           /^tenant_name = service$/,
206 213
           /^password = heat-pass$/

Loading…
Cancel
Save