diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index e2b5f06d..ec772414 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -45,7 +45,7 @@ class designate::db::mysql( ::openstacklib::db::mysql { 'designate': user => $user, - password_hash => mysql::password($password), + password => $password, dbname => $dbname, host => $host, charset => $charset, diff --git a/manifests/db/powerdns/mysql.pp b/manifests/db/powerdns/mysql.pp index 7950faa8..b74588ac 100644 --- a/manifests/db/powerdns/mysql.pp +++ b/manifests/db/powerdns/mysql.pp @@ -45,7 +45,7 @@ class designate::db::powerdns::mysql ( ::openstacklib::db::mysql { 'powerdns': user => $user, - password_hash => mysql::password($password), + password => $password, dbname => $dbname, host => $host, charset => $charset, diff --git a/metadata.json b/metadata.json index 70c8551e..4c232509 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/designate_db_mysql_spec.rb b/spec/classes/designate_db_mysql_spec.rb index 09cdaaf1..2619832e 100644 --- a/spec/classes/designate_db_mysql_spec.rb +++ b/spec/classes/designate_db_mysql_spec.rb @@ -1,3 +1,4 @@ +require 'spec_helper' describe 'designate::db::mysql' do @@ -6,7 +7,7 @@ describe 'designate::db::mysql' do end let :required_params do - { :password => "qwerty" } + { :password => "designatepass" } end shared_examples_for 'designate-db-mysql' do @@ -16,35 +17,9 @@ describe 'designate::db::mysql' do end it { is_expected.to contain_openstacklib__db__mysql('designate').with( - :user => 'designate', - :password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601', - :charset => 'utf8' - )} - end - - context 'when overriding charset' do - let :params do - { :charset => 'latin1' }.merge(required_params) - end - - it { is_expected.to contain_openstacklib__db__mysql('designate').with_charset(params[:charset]) } - end - end - - context 'on a RedHat osfamily' do - let :facts do - { :osfamily => 'RedHat' } - end - - context 'with only required parameters' do - let :params do - required_params - end - - it { is_expected.to contain_openstacklib__db__mysql('designate').with( - :user => 'designate', - :password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601', - :charset => 'utf8' + :user => 'designate', + :password => 'designatepass', + :charset => 'utf8' )} end diff --git a/spec/classes/designate_db_powerdns_mysql_spec.rb b/spec/classes/designate_db_powerdns_mysql_spec.rb index 3f273a98..0b9ed270 100644 --- a/spec/classes/designate_db_powerdns_mysql_spec.rb +++ b/spec/classes/designate_db_powerdns_mysql_spec.rb @@ -7,7 +7,7 @@ describe 'designate::db::powerdns::mysql' do end let :required_params do - { :password => "qwerty" } + { :password => "designatepass" } end @@ -18,9 +18,9 @@ describe 'designate::db::powerdns::mysql' do end it { is_expected.to contain_openstacklib__db__mysql('powerdns').with( - :user => 'powerdns', - :password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601', - :charset => 'utf8' + :user => 'powerdns', + :password => 'designatepass', + :charset => 'utf8' )} end