openstack
/
puppet-mistral
Code Issues Proposed changes

Set os_actions_endpoint_type in the openstack_actions section 

... because this parameter was already migrated from the DEFAULT
section[1].

[1] 9b0cba60b34d48f8e532dfc55c04fc7c71095bf6

Change-Id: I74f3c4509e3acd3a18bb878873002d02374baafa
This commit is contained in:
Takashi Kajinami 2021-03-28 23:44:49 +09:00
parent da6917ef5c
commit ce2b722c33
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@ -224,12 +224,16 @@ removed in a future realse. Use mistral::db::database_connection instead')
'coordination/heartbeat_interval': value => $coordination_heartbeat_interval;
'DEFAULT/report_interval': value => $report_interval;
'DEFAULT/service_down_time': value => $service_down_time;
'DEFAULT/os_actions_endpoint_type': value => $os_actions_endpoint_type;
'action_heartbeat/max_missed_heartbeats': value => $max_missed_heartbeats;
'action_heartbeat/check_interval': value => $check_interval;
'action_heartbeat/first_heartbeat_timeout': value => $first_heartbeat_timeout;
}
mistral_config {
'openstack_actions/os_actions_endpoint_type': value => $os_actions_endpoint_type;
'DEFAULT/os_actions_endpoint_type': ensure => absent;
}
oslo::messaging::default {'mistral_config':
transport_url => $default_transport_url,
control_exchange => $control_exchange,

4
spec/classes/mistral_init_spec.rb
View File

@ -62,7 +62,7 @@ describe 'mistral' do
should contain_mistral_config('keystone_authtoken/password').with(
:value => 'foo'
)
should contain_mistral_config('DEFAULT/os_actions_endpoint_type').with(
should contain_mistral_config('openstack_actions/os_actions_endpoint_type').with(
:value => '<SERVICE DEFAULT>'
)
end
@ -203,7 +203,7 @@ describe 'mistral' do
})
end
it { should contain_mistral_config('DEFAULT/os_actions_endpoint_type').with_value('internal') }
it { should contain_mistral_config('openstack_actions/os_actions_endpoint_type').with_value('internal') }
end
context 'with heartbeats parameters overridden' do