From 1de8cdd7a43ac8b5a15460ebd6c99f636b901f7f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 19 May 2020 20:00:03 +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: I1e0061aea6782bd61e745bb39683589794231a5f
---
 manifests/db/mysql.pp                   |  2 +-
 manifests/db/postgresql.pp              | 10 +++++-----
 metadata.json                           |  4 ----
 spec/classes/heat_db_mysql_spec.rb      |  6 +++---
 spec/classes/heat_db_postgresql_spec.rb | 19 ++++++++++---------
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 1987d217..0f6b5c19 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -49,7 +49,7 @@ class heat::db::mysql(
 
   ::openstacklib::db::mysql { 'heat':
     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 425bcef1..22ea2d9a 100644
--- a/manifests/db/postgresql.pp
+++ b/manifests/db/postgresql.pp
@@ -35,11 +35,11 @@ class heat::db::postgresql(
   include heat::deps
 
   ::openstacklib::db::postgresql { 'heat':
-    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['heat::db::begin']
diff --git a/metadata.json b/metadata.json
index 10c6d283..1b05d6b3 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/heat_db_mysql_spec.rb b/spec/classes/heat_db_mysql_spec.rb
index 73c821e0..a54b7d35 100644
--- a/spec/classes/heat_db_mysql_spec.rb
+++ b/spec/classes/heat_db_mysql_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'heat::db::mysql' do
 
   let :params do
-    { :password     => 's3cr3t',
+    { :password     => 'heatpass',
       :dbname       => 'heat',
       :user         => 'heat',
       :host         => 'localhost',
@@ -22,10 +22,10 @@ describe 'heat::db::mysql' do
     it 'creates a mysql database' do
       is_expected.to contain_openstacklib__db__mysql( params[:dbname] ).with(
         :user          => params[:user],
-        :password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0',
+        :password      => params[:password],
         :host          => params[:host],
         :charset       => params[:charset],
-        :collate       => 'utf8_general_ci',
+        :collate       => params[:collate],
       )
     end
   end
diff --git a/spec/classes/heat_db_postgresql_spec.rb b/spec/classes/heat_db_postgresql_spec.rb
index c06546b0..85f96942 100644
--- a/spec/classes/heat_db_postgresql_spec.rb
+++ b/spec/classes/heat_db_postgresql_spec.rb
@@ -1,17 +1,14 @@
 require 'spec_helper'
 
 describe 'heat::db::postgresql' do
+
   shared_examples_for 'heat::db::postgresql' do
     let :req_params do
-      { :password => 'pw' }
+      { :password => 'heatpass' }
     end
 
     let :pre_condition do
-      "include postgresql::server
-       class { 'heat::keystone::authtoken':
-         password => 'password',
-       }
-       include heat"
+      'include postgresql::server'
     end
 
     context 'with only required parameters' do
@@ -19,9 +16,12 @@ describe 'heat::db::postgresql' do
         req_params
       end
 
-      it { is_expected.to contain_postgresql__server__db('heat').with(
-        :user     => 'heat',
-        :password => 'md5fd5c4fca491370aab732f903e2fb7c99'
+      it { is_expected.to contain_openstacklib__db__postgresql('heat').with(
+        :user       => 'heat',
+        :password   => 'heatpass',
+        :dbname     => 'heat',
+        :encoding   => nil,
+        :privileges => 'ALL',
       )}
     end
 
@@ -33,6 +33,7 @@ describe 'heat::db::postgresql' do
     context "on #{os}" do
       let (:facts) do
         facts.merge(OSDefaults.get_facts({
+          :os_workers => 8,
           :concat_basedir => '/var/lib/puppet/concat'
         }))
       end