From b249de4961adf09e9a471a8ff15bb9d343b8feb8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 20 May 2020 08:08:49 +0900 Subject: [PATCH] Remove password hash generation in each puppet modules ... and migrate it to openstacklib so that all logics about database configuration are implemented in one common place. Depends-on: https://review.opendev.org/#/c/728595/ Change-Id: Ia78263a801dd920ded47c898800bc7f2fa88becc --- manifests/db/mysql.pp | 2 +- manifests/db/mysql_cfapi.pp | 2 +- manifests/db/postgresql.pp | 10 +++---- manifests/db/postgresql_cfapi.pp | 10 +++---- metadata.json | 4 --- spec/classes/murano_db_mysql_cfapi_spec.rb | 28 +++++++++---------- spec/classes/murano_db_mysql_spec.rb | 8 +++--- .../murano_db_postgresql_cfapi_spec.rb | 11 +++++--- spec/classes/murano_db_postgresql_spec.rb | 11 +++++--- 9 files changed, 44 insertions(+), 42 deletions(-) diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index e7ec98f..5112a08 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -48,7 +48,7 @@ class murano::db::mysql( ::openstacklib::db::mysql{ 'murano': user => $user, - password_hash => mysql::password($password), + password => $password, dbname => $dbname, host => $host, charset => $charset, diff --git a/manifests/db/mysql_cfapi.pp b/manifests/db/mysql_cfapi.pp index 9c253ec..d09fb34 100644 --- a/manifests/db/mysql_cfapi.pp +++ b/manifests/db/mysql_cfapi.pp @@ -48,7 +48,7 @@ class murano::db::mysql_cfapi( ::openstacklib::db::mysql{ 'murano_cfapi': user => $user, - password_hash => mysql::password($password), + password => $password, dbname => $dbname, host => $host, charset => $charset, diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index a705524..0f54cab 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -37,11 +37,11 @@ class murano::db::postgresql( validate_legacy(String, 'validate_string', $password) ::openstacklib::db::postgresql { 'murano': - password_hash => postgresql_password($user, $password), - dbname => $dbname, - user => $user, - encoding => $encoding, - privileges => $privileges, + password => $password, + dbname => $dbname, + user => $user, + encoding => $encoding, + privileges => $privileges, } Anchor['murano::db::begin'] diff --git a/manifests/db/postgresql_cfapi.pp b/manifests/db/postgresql_cfapi.pp index a0f1ee0..162ad57 100644 --- a/manifests/db/postgresql_cfapi.pp +++ b/manifests/db/postgresql_cfapi.pp @@ -37,11 +37,11 @@ class murano::db::postgresql_cfapi( validate_legacy(String, 'validate_string', $password) ::openstacklib::db::postgresql { 'murano_cfapi': - password_hash => postgresql_password($user, $password), - dbname => $dbname, - user => $user, - encoding => $encoding, - privileges => $privileges, + password => $password, + dbname => $dbname, + user => $user, + encoding => $encoding, + privileges => $privileges, } Anchor['murano::db::begin'] diff --git a/metadata.json b/metadata.json index 4239270..3bc9d62 100644 --- a/metadata.json +++ b/metadata.json @@ -13,10 +13,6 @@ "name": "puppet/rabbitmq", "version_requirement": ">=8.4.0 <11.0.0" }, - { - "name": "puppetlabs/mysql", - "version_requirement": ">=6.0.0 <11.0.0" - }, { "name": "puppetlabs/stdlib", "version_requirement": ">=5.0.0 <7.0.0" diff --git a/spec/classes/murano_db_mysql_cfapi_spec.rb b/spec/classes/murano_db_mysql_cfapi_spec.rb index 5a69596..ef4c665 100644 --- a/spec/classes/murano_db_mysql_cfapi_spec.rb +++ b/spec/classes/murano_db_mysql_cfapi_spec.rb @@ -7,12 +7,12 @@ describe 'murano::db::mysql_cfapi' do end let :params do - { :dbname => 'murano_cfapi', - :password => 's3cr3t', - :user => 'murano_cfapi', - :charset => 'utf8', - :collate => 'utf8_general_ci', - :host => '127.0.0.1', + { :dbname => 'murano_cfapi', + :password => 'muranopass', + :user => 'murano_cfapi', + :charset => 'utf8', + :collate => 'utf8_general_ci', + :host => '127.0.0.1', } end @@ -25,18 +25,18 @@ describe 'murano::db::mysql_cfapi' do it 'creates a mysql database' do is_expected.to contain_openstacklib__db__mysql('murano_cfapi').with( - :user => params[:user], - :dbname => params[:dbname], - :password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0', - :host => params[:host], - :charset => params[:charset] + :user => params[:user], + :dbname => params[:dbname], + :password => params[:password], + :host => params[:host], + :charset => params[:charset] ) end context 'overriding allowed_hosts param to array' do before :each do params.merge!( - :allowed_hosts => ['127.0.0.1','%'] + :allowed_hosts => ['127.0.0.1','%'] ) end @@ -44,7 +44,7 @@ describe 'murano::db::mysql_cfapi' do is_expected.to contain_openstacklib__db__mysql('murano_cfapi').with( :user => params[:user], :dbname => params[:dbname], - :password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0', + :password => params[:password], :host => params[:host], :charset => params[:charset], :allowed_hosts => ['127.0.0.1','%'] @@ -62,7 +62,7 @@ describe 'murano::db::mysql_cfapi' do is_expected.to contain_openstacklib__db__mysql('murano_cfapi').with( :user => params[:user], :dbname => params[:dbname], - :password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0', + :password => params[:password], :host => params[:host], :charset => params[:charset], :allowed_hosts => '192.168.1.1' diff --git a/spec/classes/murano_db_mysql_spec.rb b/spec/classes/murano_db_mysql_spec.rb index 95d2476..18fb0e3 100644 --- a/spec/classes/murano_db_mysql_spec.rb +++ b/spec/classes/murano_db_mysql_spec.rb @@ -8,7 +8,7 @@ describe 'murano::db::mysql' do let :params do { :dbname => 'murano', - :password => 's3cr3t', + :password => 'muranopass', :user => 'murano', :charset => 'utf8', :collate => 'utf8_general_ci', @@ -27,7 +27,7 @@ describe 'murano::db::mysql' do is_expected.to contain_openstacklib__db__mysql('murano').with( :user => params[:user], :dbname => params[:dbname], - :password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0', + :password => params[:password], :host => params[:host], :charset => params[:charset] ) @@ -44,7 +44,7 @@ describe 'murano::db::mysql' do is_expected.to contain_openstacklib__db__mysql('murano').with( :user => params[:user], :dbname => params[:dbname], - :password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0', + :password => params[:password], :host => params[:host], :charset => params[:charset], :allowed_hosts => ['127.0.0.1','%'] @@ -62,7 +62,7 @@ describe 'murano::db::mysql' do is_expected.to contain_openstacklib__db__mysql('murano').with( :user => params[:user], :dbname => params[:dbname], - :password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0', + :password => params[:password], :host => params[:host], :charset => params[:charset], :allowed_hosts => '192.168.1.1' diff --git a/spec/classes/murano_db_postgresql_cfapi_spec.rb b/spec/classes/murano_db_postgresql_cfapi_spec.rb index 3b22139..300f7e3 100644 --- a/spec/classes/murano_db_postgresql_cfapi_spec.rb +++ b/spec/classes/murano_db_postgresql_cfapi_spec.rb @@ -4,7 +4,7 @@ describe 'murano::db::postgresql_cfapi' do shared_examples_for 'murano::db::postgresql_cfapi' do let :req_params do - { :password => 'pw' } + { :password => 'muranopass' } end let :pre_condition do @@ -16,9 +16,12 @@ describe 'murano::db::postgresql_cfapi' do req_params end - it { is_expected.to contain_postgresql__server__db('murano_cfapi').with( - :user => 'murano_cfapi', - :password => 'md594583175c7aca1cf386f1c97c50fda19' + it { is_expected.to contain_openstacklib__db__postgresql('murano_cfapi').with( + :user => 'murano_cfapi', + :password => 'muranopass', + :dbname => 'murano_cfapi', + :encoding => nil, + :privileges => 'ALL', )} end diff --git a/spec/classes/murano_db_postgresql_spec.rb b/spec/classes/murano_db_postgresql_spec.rb index 86c0ab4..d8347b2 100644 --- a/spec/classes/murano_db_postgresql_spec.rb +++ b/spec/classes/murano_db_postgresql_spec.rb @@ -4,7 +4,7 @@ describe 'murano::db::postgresql' do shared_examples_for 'murano::db::postgresql' do let :req_params do - { :password => 'pw' } + { :password => 'muranopass' } end let :pre_condition do @@ -16,9 +16,12 @@ describe 'murano::db::postgresql' do req_params end - it { is_expected.to contain_postgresql__server__db('murano').with( - :user => 'murano', - :password => 'md5c73cd23dae0b015e51ff2b38714d0bab' + it { is_expected.to contain_openstacklib__db__postgresql('murano').with( + :user => 'murano', + :password => 'muranopass', + :dbname => 'murano', + :encoding => nil, + :privileges => 'ALL', )} end