From b046aa43ea778cdf912ea674198a0b16c69efaa9 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 16 May 2020 09:19:48 +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: I1fe4c1eed71e9b4ca977b206edefbd0c700af74d
---
 manifests/db/mysql.pp                   |  2 +-
 manifests/db/postgresql.pp              | 10 ++++-----
 metadata.json                           |  4 ----
 spec/classes/aodh_db_mysql_spec.rb      | 30 ++++++++++++-------------
 spec/classes/aodh_db_postgresql_spec.rb | 11 +++++----
 5 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 947c5dce..4721af4f 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -49,7 +49,7 @@ class aodh::db::mysql(
 
   openstacklib::db::mysql { 'aodh':
     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 ffd763bf..017bbf74 100644
--- a/manifests/db/postgresql.pp
+++ b/manifests/db/postgresql.pp
@@ -35,11 +35,11 @@ class aodh::db::postgresql(
   include aodh::deps
 
   openstacklib::db::postgresql { 'aodh':
-    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['aodh::db::begin']
diff --git a/metadata.json b/metadata.json
index 0bf68335..dcc5b2b7 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": "openstack/keystone",
             "version_requirement": ">=16.3.0 <17.0.0"
diff --git a/spec/classes/aodh_db_mysql_spec.rb b/spec/classes/aodh_db_mysql_spec.rb
index cda48df2..f59a3233 100644
--- a/spec/classes/aodh_db_mysql_spec.rb
+++ b/spec/classes/aodh_db_mysql_spec.rb
@@ -11,49 +11,47 @@ describe 'aodh::db::mysql' do
 
   let :params do
     {
-      'password'      => 'fooboozoo_default_password',
+      'password' => 'aodhpass',
     }
   end
 
   shared_examples_for 'aodh::db::mysql' do
     context 'with only required params' do
       it { is_expected.to contain_openstacklib__db__mysql('aodh').with(
-        'user'          => 'aodh',
-        'password_hash' => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
-        'dbname'        => 'aodh',
-        'host'          => '127.0.0.1',
-        'charset'       => 'utf8',
-        :collate        => 'utf8_general_ci',
+        'user'     => 'aodh',
+        'password' => 'aodhpass',
+        'dbname'   => 'aodh',
+        'host'     => '127.0.0.1',
+        'charset'  => 'utf8',
+        :collate   => 'utf8_general_ci',
       )}
     end
 
     context "overriding allowed_hosts param to array" do
       let :params do
         {
-          :password       => 'aodhpass',
-          :allowed_hosts  => ['127.0.0.1','%']
+          :password      => 'aodhpass',
+          :allowed_hosts => ['127.0.0.1','%']
         }
       end
-
     end
+
     context "overriding allowed_hosts param to string" do
       let :params do
         {
-          :password       => 'aodhpass2',
-          :allowed_hosts  => '192.168.1.1'
+          :password      => 'aodhpass2',
+          :allowed_hosts => '192.168.1.1'
         }
       end
-
     end
 
     context "overriding allowed_hosts param equals to host param " do
       let :params do
         {
-          :password       => 'aodhpass2',
-          :allowed_hosts  => '127.0.0.1'
+          :password      => 'aodhpass2',
+          :allowed_hosts => '127.0.0.1'
         }
       end
-
     end
   end
 
diff --git a/spec/classes/aodh_db_postgresql_spec.rb b/spec/classes/aodh_db_postgresql_spec.rb
index 4f868625..80a16611 100644
--- a/spec/classes/aodh_db_postgresql_spec.rb
+++ b/spec/classes/aodh_db_postgresql_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'aodh::db::postgresql' do
 
   let :req_params do
-    { :password => 'pw' }
+    { :password => 'aodhpass' }
   end
 
   let :pre_condition do
@@ -16,9 +16,12 @@ describe 'aodh::db::postgresql' do
         req_params
       end
 
-      it { is_expected.to contain_postgresql__server__db('aodh').with(
-        :user     => 'aodh',
-        :password => 'md534e5dd092d680f3d8c11c62951fb5c19'
+      it { is_expected.to contain_openstacklib__db__postgresql('aodh').with(
+        :user       => 'aodh',
+        :password   => 'aodhpass',
+        :dbname     => 'aodh',
+        :encoding   => nil,
+        :privileges => 'ALL',
       )}
     end