openstack
/
puppet-sahara
Code Issues Proposed changes

[DEFAULT] periodic_coordinator_backend_url should be secret 

This option can sometimes contain secrets.

For example when redis coordination backend is used and authentication
is enabled in redis, the plain redis password is put as an URL element.

[DEFAULT]
periodic_coordinator_backend_url=redis://:password@127.0.0.1:6379

Closes-Bug: #2012246
Change-Id: I514dbead158c72c43c8e077aad2a4935b3b99040
This commit is contained in:
Takashi Kajinami 2023-03-20 21:13:03 +09:00
parent bced4f3e03
commit b82c6813c1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/service/engine.pp
View File

@ -107,7 +107,7 @@ class sahara::service::engine (
'DEFAULT/periodic_interval_max': value => $periodic_interval_max;
'DEFAULT/min_transient_cluster_active_time': value => $min_transient_cluster_active_time;
'DEFAULT/cleanup_time_for_incomplete_clusters': value => $cleanup_time_for_incomplete_clusters;
'DEFAULT/periodic_coordinator_backend_url': value => $periodic_coordinator_backend_url;
'DEFAULT/periodic_coordinator_backend_url': value => $periodic_coordinator_backend_url, secret => true;
'DEFAULT/periodic_workers_number': value => $periodic_workers_number;
'DEFAULT/coordinator_heartbeat_interval': value => $coordinator_heartbeat_interval;
'DEFAULT/hash_ring_replicas_count': value => $hash_ring_replicas_count;

4
spec/classes/sahara_engine_spec.rb
View File

@ -34,7 +34,7 @@ describe 'sahara::service::engine' do
should contain_sahara_config('DEFAULT/periodic_interval_max').with_value('<SERVICE DEFAULT>')
should contain_sahara_config('DEFAULT/min_transient_cluster_active_time').with_value('<SERVICE DEFAULT>')
should contain_sahara_config('DEFAULT/cleanup_time_for_incomplete_clusters').with_value('<SERVICE DEFAULT>')
should contain_sahara_config('DEFAULT/periodic_coordinator_backend_url').with_value('<SERVICE DEFAULT>')
should contain_sahara_config('DEFAULT/periodic_coordinator_backend_url').with_value('<SERVICE DEFAULT>').with_secret(true)
should contain_sahara_config('DEFAULT/periodic_workers_number').with_value('<SERVICE DEFAULT>')
should contain_sahara_config('DEFAULT/coordinator_heartbeat_interval').with_value('<SERVICE DEFAULT>')
should contain_sahara_config('DEFAULT/hash_ring_replicas_count').with_value('<SERVICE DEFAULT>')
@ -78,7 +78,7 @@ describe 'sahara::service::engine' do
should contain_sahara_config('DEFAULT/periodic_interval_max').with_value(61)
should contain_sahara_config('DEFAULT/min_transient_cluster_active_time').with_value(30)
should contain_sahara_config('DEFAULT/cleanup_time_for_incomplete_clusters').with_value(0)
should contain_sahara_config('DEFAULT/periodic_coordinator_backend_url').with_value('etcd3+http://127.0.0.1:2379')
should contain_sahara_config('DEFAULT/periodic_coordinator_backend_url').with_value('etcd3+http://127.0.0.1:2379').with_secret(true)
should contain_sahara_config('DEFAULT/periodic_workers_number').with_value(4)
should contain_sahara_config('DEFAULT/coordinator_heartbeat_interval').with_value(1)
should contain_sahara_config('DEFAULT/hash_ring_replicas_count').with_value(40)