From 814ae8df60ee842a126c2ecced47c42b0528ad4d Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 4 Apr 2018 13:53:46 +0800 Subject: [PATCH] Configure metadata_proxy_shared_secret as secret Parameter metadata/metadata_proxy_shared_secret should be configured as a secret. Change-Id: I5214b3859e74c60cbc82571125ce38718f589545 Closes-Bug: #1761060 --- manifests/metadata.pp | 2 +- spec/classes/ec2api_metadata_spec.rb | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/manifests/metadata.pp b/manifests/metadata.pp index 15fcb3f..be102a4 100644 --- a/manifests/metadata.pp +++ b/manifests/metadata.pp @@ -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; diff --git a/spec/classes/ec2api_metadata_spec.rb b/spec/classes/ec2api_metadata_spec.rb index 03704a4..5988e42 100644 --- a/spec/classes/ec2api_metadata_spec.rb +++ b/spec/classes/ec2api_metadata_spec.rb @@ -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('').with_secret(true) + end + service_parameters = { ensure: 'running', enable: true,