openstack
/
puppet-ec2api
Code Issues Proposed changes

Merge "Configure metadata_proxy_shared_secret as secret"

This commit is contained in:
Zuul 2018-04-13 19:14:48 +00:00 committed by Gerrit Code Review
parent 2f754deb0b 814ae8df60
commit deb14f5c4c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/metadata.pp
View File

@ -106,7 +106,7 @@ class ec2api::metadata (
'metadata/auth_ca_cert': value => $auth_ca_cert;
'metadata/nova_client_cert': value => $nova_client_cert;
'metadata/nova_client_priv_key': value => $nova_client_priv_key;
'metadata/metadata_proxy_shared_secret': value => $metadata_proxy_shared_secret;
'metadata/metadata_proxy_shared_secret': value => $metadata_proxy_shared_secret, secret => true;
'DEFAULT/metadata_listen': value => $metadata_listen;
'DEFAULT/metadata_listen_port': value => $metadata_listen_port;
'DEFAULT/metadata_use_ssl': value => $metadata_use_ssl;

5
spec/classes/ec2api_metadata_spec.rb
View File

@ -14,7 +14,6 @@ describe 'ec2api::metadata', type: :class do
metadata/auth_ca_cert
metadata/nova_client_cert
metadata/nova_client_priv_key
metadata/metadata_proxy_shared_secret
DEFAULT/metadata_listen
DEFAULT/metadata_listen_port
DEFAULT/metadata_use_ssl
@ -37,6 +36,10 @@ describe 'ec2api::metadata', type: :class do
is_expected.to contain_ec2api_config('DEFAULT/metadata_workers').with_value(2)
end
it 'configures metadata_proxy_shared_secret' do
is_expected.to contain_ec2api_config('metadata/metadata_proxy_shared_secret').with_value('<SERVICE DEFAULT>').with_secret(true)
end
service_parameters = {
ensure: 'running',
enable: true,