From 1763ccc4169c4b84b0ef13e19bc4742bb3f01d71 Mon Sep 17 00:00:00 2001 From: Michael Arnold Date: Tue, 20 Jan 2015 23:20:48 -0700 Subject: [PATCH] Update puppetlabs/postgresql dep to >=3.0.0 <5.0.0 --- .fixtures.yml | 6 ++---- manifests/cm/server.pp | 8 ++++---- manifests/cm5/server.pp | 8 ++++---- metadata.json | 4 ++-- spec/classes/cloudera_cm5_server_spec.rb | 15 +++++++-------- spec/classes/cloudera_cm_server_spec.rb | 15 +++++++-------- 6 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index cb69267..0ad7c66 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -4,10 +4,8 @@ fixtures: mysql: repo: "https://github.com/puppetlabs/puppetlabs-mysql.git" ref: "2.1.0" - postgresql: - repo: "https://github.com/puppetlabs/puppet-postgresql.git" - ref: "2.5.0" - concat: "https://github.com/ripienaar/puppet-concat.git" + postgresql: "https://github.com/puppetlabs/puppet-postgresql.git" + concat: "https://github.com/puppetlabs/puppetlabs-concat.git" staging: "https://github.com/nanliu/puppet-staging.git" epel: "https://github.com/stahnma/puppet-module-epel.git" java_ks: "https://github.com/puppetlabs/puppetlabs-java_ks.git" diff --git a/manifests/cm/server.pp b/manifests/cm/server.pp index 22e2998..13fd3eb 100644 --- a/manifests/cm/server.pp +++ b/manifests/cm/server.pp @@ -91,7 +91,7 @@ # Class['::mysql::server'] # Class['::oraclerdbms::java'] # Class['::oraclerdbms::server'] -# Class['::postgresql::java'] +# Class['::postgresql::lib::java'] # Class['::postgresql::server'] # Package['jdk'] # java_ks @@ -267,12 +267,12 @@ $scm_prepare_database_require = [ Package['cloudera-manager-server'], Class['::postgresql::server'], ] } - if ! defined(Class['::postgresql::java']) { - include '::postgresql::java' + if ! defined(Class['::postgresql::lib::java']) { + include '::postgresql::lib::java' } # TODO: Figure out postgresql auth to make Exec['scm_prepare_database'] work. realize Exec['scm_prepare_database'] - Class['::postgresql::java'] -> Exec['scm_prepare_database'] + Class['::postgresql::lib::java'] -> Exec['scm_prepare_database'] } default: { } } diff --git a/manifests/cm5/server.pp b/manifests/cm5/server.pp index fbbf5e5..1981d41 100644 --- a/manifests/cm5/server.pp +++ b/manifests/cm5/server.pp @@ -91,7 +91,7 @@ # Class['::mysql::server'] # Class['::oraclerdbms::java'] # Class['::oraclerdbms::server'] -# Class['::postgresql::java'] +# Class['::postgresql::lib::java'] # Class['::postgresql::server'] # Package['jdk'] # java_ks @@ -267,12 +267,12 @@ $scm_prepare_database_require = [ Package['cloudera-manager-server'], Class['::postgresql::server'], ] } - if ! defined(Class['::postgresql::java']) { - include '::postgresql::java' + if ! defined(Class['::postgresql::lib::java']) { + include '::postgresql::lib::java' } # TODO: Figure out postgresql auth to make Exec['scm_prepare_database'] work. realize Exec['scm_prepare_database'] - Class['::postgresql::java'] -> Exec['scm_prepare_database'] + Class['::postgresql::lib::java'] -> Exec['scm_prepare_database'] } default: { } } diff --git a/metadata.json b/metadata.json index d95e7b3..8a64eec 100644 --- a/metadata.json +++ b/metadata.json @@ -18,7 +18,7 @@ "name": "puppetlabs/mysql" }, { - "version_requirement": ">=2.1.0 <3.0.0", + "version_requirement": ">=3.0.0 <5.0.0", "name": "puppetlabs/postgresql" }, { @@ -75,7 +75,7 @@ "requirements": [ { "name": "pe", - "version_requirement": ">=3.0.0 <3.3.0" + "version_requirement": ">=3.3.0 <4.0.0" }, { "name": "puppet", diff --git a/spec/classes/cloudera_cm5_server_spec.rb b/spec/classes/cloudera_cm5_server_spec.rb index e6eb9c3..a637729 100644 --- a/spec/classes/cloudera_cm5_server_spec.rb +++ b/spec/classes/cloudera_cm5_server_spec.rb @@ -296,12 +296,11 @@ context 'on a supported operatingsystem, custom parameters, db_type => postgresql' do let :facts do { - :concat_basedir => '/var/lib/puppet/concat', - :fqdn => 'myhost.example.com', - :postgres_default_version => 'somevar', - :osfamily => 'RedHat', - :operatingsystem => 'OracleLinux', - :operatingsystemrelease => '6.4' + :concat_basedir => '/var/lib/puppet/concat', + :fqdn => 'myhost.example.com', + :osfamily => 'RedHat', + :operatingsystem => 'OracleLinux', + :operatingsystemrelease => '6.4' } end @@ -321,7 +320,7 @@ 'com.cloudera.cmf.db.password=scm', ]) end - it { should contain_class('postgresql::java') } + it { should contain_class('postgresql::lib::java') } it { should contain_exec('scm_prepare_database').with( :command => '/usr/share/cmf/schema/scm_prepare_database.sh postgresql --user=root --password= scm scm scm && touch /etc/cloudera-scm-server/.scm_prepare_database', :creates => '/etc/cloudera-scm-server/.scm_prepare_database', @@ -352,7 +351,7 @@ 'com.cloudera.cmf.db.password=myDbPass', ]) end - it { should contain_class('postgresql::java') } + it { should contain_class('postgresql::lib::java') } it { should contain_exec('scm_prepare_database').with( :command => '/usr/share/cmf/schema/scm_prepare_database.sh postgresql --host=dbhost.example.com --port=9000 --scm-host=myhost.example.com --user=dbadmin --password=myPass clouderaDB dbuser myDbPass && touch /etc/cloudera-scm-server/.scm_prepare_database', :creates => '/etc/cloudera-scm-server/.scm_prepare_database', diff --git a/spec/classes/cloudera_cm_server_spec.rb b/spec/classes/cloudera_cm_server_spec.rb index 9014f18..60aa395 100644 --- a/spec/classes/cloudera_cm_server_spec.rb +++ b/spec/classes/cloudera_cm_server_spec.rb @@ -292,12 +292,11 @@ context 'on a supported operatingsystem, custom parameters, db_type => postgresql' do let :facts do { - :concat_basedir => '/var/lib/puppet/concat', - :fqdn => 'myhost.example.com', - :postgres_default_version => 'somevar', - :osfamily => 'RedHat', - :operatingsystem => 'OracleLinux', - :operatingsystemrelease => '6.4' + :concat_basedir => '/var/lib/puppet/concat', + :fqdn => 'myhost.example.com', + :osfamily => 'RedHat', + :operatingsystem => 'OracleLinux', + :operatingsystemrelease => '6.4' } end @@ -317,7 +316,7 @@ 'com.cloudera.cmf.db.password=scm', ]) end - it { should contain_class('postgresql::java') } + it { should contain_class('postgresql::lib::java') } it { should contain_exec('scm_prepare_database').with( :command => '/usr/share/cmf/schema/scm_prepare_database.sh postgresql --user=root --password= scm scm scm && touch /etc/cloudera-scm-server/.scm_prepare_database', :creates => '/etc/cloudera-scm-server/.scm_prepare_database', @@ -348,7 +347,7 @@ 'com.cloudera.cmf.db.password=myDbPass', ]) end - it { should contain_class('postgresql::java') } + it { should contain_class('postgresql::lib::java') } it { should contain_exec('scm_prepare_database').with( :command => '/usr/share/cmf/schema/scm_prepare_database.sh postgresql --host=dbhost.example.com --port=9000 --scm-host=myhost.example.com --user=dbadmin --password=myPass clouderaDB dbuser myDbPass && touch /etc/cloudera-scm-server/.scm_prepare_database', :creates => '/etc/cloudera-scm-server/.scm_prepare_database',