From 9fe1ed6b37a0c35462e321b8900e2a6ccdca7647 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 19 May 2020 20:37:43 +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: If3221ecf5a1c949f253849fd963ed4b94498d30e
---
 manifests/db/mysql.pp                        |  2 +-
 manifests/db/postgresql.pp                   | 10 ++---
 metadata.json                                |  4 --
 spec/classes/placement_db_mysql_spec.rb      | 42 ++++++++++----------
 spec/classes/placement_db_postgresql_spec.rb | 11 +++--
 5 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 3dcb49f..c4ec191 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -49,7 +49,7 @@ class placement::db::mysql(
 
   ::openstacklib::db::mysql { 'placement':
     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 de84a39..cc55abe 100644
--- a/manifests/db/postgresql.pp
+++ b/manifests/db/postgresql.pp
@@ -35,11 +35,11 @@ class placement::db::postgresql(
   include placement::deps
 
   ::openstacklib::db::postgresql { 'placement':
-    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['placement::db::begin']
diff --git a/metadata.json b/metadata.json
index 67c818f..a6cc712 100644
--- a/metadata.json
+++ b/metadata.json
@@ -9,10 +9,6 @@
             "name": "puppetlabs/stdlib",
             "version_requirement": ">=5.0.0 <7.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/placement_db_mysql_spec.rb b/spec/classes/placement_db_mysql_spec.rb
index 019377d..763ceaf 100644
--- a/spec/classes/placement_db_mysql_spec.rb
+++ b/spec/classes/placement_db_mysql_spec.rb
@@ -7,19 +7,19 @@ describe 'placement::db::mysql' do
 
   let :params do
     {
-      :password => 'fooboozoo_default_password',
+      :password => 'placementpass',
     }
   end
 
   shared_examples 'placement::db::mysql' do
     context 'with only required params' do
       it { should contain_openstacklib__db__mysql('placement').with(
-        :user           => 'placement',
-        :password_hash  => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
-        :dbname         => 'placement',
-        :host           => '127.0.0.1',
-        :charset        => 'utf8',
-        :collate        => 'utf8_general_ci',
+        :user     => 'placement',
+        :password => 'placementpass',
+        :dbname   => 'placement',
+        :host     => '127.0.0.1',
+        :charset  => 'utf8',
+        :collate  => 'utf8_general_ci',
       )}
     end
 
@@ -29,13 +29,13 @@ describe 'placement::db::mysql' do
       end
 
       it { should contain_openstacklib__db__mysql('placement').with(
-        :user           => 'placement',
-        :password_hash  => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
-        :dbname         => 'placement',
-        :host           => '127.0.0.1',
-        :charset        => 'utf8',
-        :collate        => 'utf8_general_ci',
-        :allowed_hosts  => ['127.0.0.1','%']
+        :user          => 'placement',
+        :password      => 'placementpass',
+        :dbname        => 'placement',
+        :host          => '127.0.0.1',
+        :charset       => 'utf8',
+        :collate       => 'utf8_general_ci',
+        :allowed_hosts => ['127.0.0.1','%']
       )}
     end
 
@@ -45,13 +45,13 @@ describe 'placement::db::mysql' do
       end
 
       it { should contain_openstacklib__db__mysql('placement').with(
-        :user           => 'placement',
-        :password_hash  => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
-        :dbname         => 'placement',
-        :host           => '127.0.0.1',
-        :charset        => 'utf8',
-        :collate        => 'utf8_general_ci',
-        :allowed_hosts  => '192.168.1.1'
+        :user          => 'placement',
+        :password      => 'placementpass',
+        :dbname        => 'placement',
+        :host          => '127.0.0.1',
+        :charset       => 'utf8',
+        :collate       => 'utf8_general_ci',
+        :allowed_hosts => '192.168.1.1'
       )}
     end
   end
diff --git a/spec/classes/placement_db_postgresql_spec.rb b/spec/classes/placement_db_postgresql_spec.rb
index 487c9c1..c1716b7 100644
--- a/spec/classes/placement_db_postgresql_spec.rb
+++ b/spec/classes/placement_db_postgresql_spec.rb
@@ -7,15 +7,18 @@ describe 'placement::db::postgresql' do
 
   let :params do
     {
-      :password => 'pw'
+      :password => 'placementpass'
     }
   end
 
   shared_examples 'placement::db::postgresql' do
     context 'with only required parameters' do
-      it { should contain_postgresql__server__db('placement').with(
-        :user     => 'placement',
-        :password => 'md51c1dd6fb4863b046eecc6a6b91f53f7f'
+      it { is_expected.to contain_openstacklib__db__postgresql('placement').with(
+        :user       => 'placement',
+        :password   => 'placementpass',
+        :dbname     => 'placement',
+        :encoding   => nil,
+        :privileges => 'ALL',
       )}
     end
   end