From 7f8c06644e1b7c8a71187ade53a4bac48d22e1dc Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Tue, 12 Feb 2019 11:18:02 +0800 Subject: [PATCH] Set a warning for the password option Change-Id: I6090bdf6928551cd6f0095777431ba1beaaef313 --- manifests/keystone/authtoken.pp | 4 ++++ spec/classes/placement_keystone_authtoken_spec.rb | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index f1e38ad..984447a 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -198,6 +198,10 @@ class placement::keystone::authtoken( include ::placement::deps + if is_service_default($password) { + fail('Please set password for Placement service user') + } + keystone::resource::authtoken { 'placement_config': username => $username, password => $password, diff --git a/spec/classes/placement_keystone_authtoken_spec.rb b/spec/classes/placement_keystone_authtoken_spec.rb index ee98417..f26eb01 100644 --- a/spec/classes/placement_keystone_authtoken_spec.rb +++ b/spec/classes/placement_keystone_authtoken_spec.rb @@ -2,15 +2,14 @@ require 'spec_helper' describe 'placement::keystone::authtoken' do let :params do - { - } + { :password => 'placement_password', } end shared_examples 'placement::keystone::authtoken' do context 'with default parameters' do it { is_expected.to contain_placement_config('keystone_authtoken/username').with_value('placement') - is_expected.to contain_placement_config('keystone_authtoken/password').with_value('') + is_expected.to contain_placement_config('keystone_authtoken/password').with_value('placement_password') is_expected.to contain_placement_config('keystone_authtoken/auth_url').with_value('http://localhost:5000') is_expected.to contain_placement_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_placement_config('keystone_authtoken/user_domain_name').with_value('Default')