diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 238fb6a..4aba5dc 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -49,7 +49,7 @@ class congress::db::mysql( ::openstacklib::db::mysql { 'congress': 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 cce2cdd..bc3deb8 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -35,11 +35,11 @@ class congress::db::postgresql( include congress::deps ::openstacklib::db::postgresql { 'congress': - 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['congress::db::begin'] diff --git a/metadata.json b/metadata.json index 6fb5e84..b262758 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/openstacklib", "version_requirement": ">=17.0.0 <18.0.0" diff --git a/spec/classes/congress_db_mysql_spec.rb b/spec/classes/congress_db_mysql_spec.rb index 0a75346..4d1e6cb 100644 --- a/spec/classes/congress_db_mysql_spec.rb +++ b/spec/classes/congress_db_mysql_spec.rb @@ -7,7 +7,7 @@ describe 'congress::db::mysql' do end let :required_params do - { :password => 'fooboozoo_default_password', } + { :password => 'congresspass', } end shared_examples_for 'congress-db-mysql' do @@ -18,7 +18,7 @@ describe 'congress::db::mysql' do it { is_expected.to contain_openstacklib__db__mysql('congress').with( :user => 'congress', - :password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206', + :password => 'congresspass', :dbname => 'congress', :host => '127.0.0.1', :charset => 'utf8', @@ -33,7 +33,7 @@ describe 'congress::db::mysql' do it { is_expected.to contain_openstacklib__db__mysql('congress').with( :user => 'congress', - :password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206', + :password => 'congresspass', :dbname => 'congress', :host => '127.0.0.1', :charset => 'utf8', @@ -49,7 +49,7 @@ describe 'congress::db::mysql' do it { is_expected.to contain_openstacklib__db__mysql('congress').with( :user => 'congress', - :password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206', + :password => 'congresspass', :dbname => 'congress', :host => '127.0.0.1', :charset => 'utf8', diff --git a/spec/classes/congress_db_postgresql_spec.rb b/spec/classes/congress_db_postgresql_spec.rb index d05aade..8d9de6d 100644 --- a/spec/classes/congress_db_postgresql_spec.rb +++ b/spec/classes/congress_db_postgresql_spec.rb @@ -7,7 +7,7 @@ describe 'congress::db::postgresql' do end let :required_params do - { :password => 'pw' } + { :password => 'congresspass' } end shared_examples_for 'congress-db-postgresql' do @@ -16,9 +16,12 @@ describe 'congress::db::postgresql' do required_params end - it { is_expected.to contain_postgresql__server__db('congress').with( - :user => 'congress', - :password => 'md5a2f665ba4d66aae91c2a86eedd8e564e' + it { is_expected.to contain_openstacklib__db__postgresql('congress').with( + :user => 'congress', + :password => 'congresspass', + :dbname => 'congress', + :encoding => nil, + :privileges => 'ALL', )} end end