diff --git a/manifests/database/postgresql.pp b/manifests/database/postgresql.pp index 85d6929..3364e6f 100644 --- a/manifests/database/postgresql.pp +++ b/manifests/database/postgresql.pp @@ -1,39 +1,39 @@ # Class for creating the PuppetDB postgresql database. See README.md for more # information. class puppetdb::database::postgresql( $listen_addresses = $puppetdb::params::database_host, $database_name = $puppetdb::params::database_name, $database_username = $puppetdb::params::database_username, $database_password = $puppetdb::params::database_password, $database_port = $puppetdb::params::database_port, $manage_server = $puppetdb::params::manage_dbserver, $manage_package_repo = $puppetdb::params::manage_pg_repo, $postgres_version = $puppetdb::params::postgres_version, ) inherits puppetdb::params { if $manage_server { class { '::postgresql::globals': manage_package_repo => $manage_package_repo, version => $postgres_version, } # get the pg server up and running class { '::postgresql::server': ip_mask_allow_all_users => '0.0.0.0/0', listen_addresses => $listen_addresses, port => scanf($database_port, '%i')[0], } # get the pg contrib to use pg_trgm extension class { '::postgresql::server::contrib': } postgresql::server::extension { 'pg_trgm': - database => $database_name, - require => Postgresql::Server::Db[$database_name], + database => $database_name, + require => Postgresql::Server::Db[$database_name], } } # create the puppetdb database postgresql::server::db { $database_name: user => $database_username, password => $database_password, grant => 'all', } } diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml index 0058942..7ead34b 100644 --- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml +++ b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml @@ -1,15 +1,20 @@ --- HOSTS: ubuntu-1404-x64: roles: - master platform: ubuntu-14.04-amd64 hypervisor: docker image: ubuntu:14.04 docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: # ensure that upstart is booting correctly in the container + - 'sudo apt-get install apt-transport-https --assume-yes' + - 'wget -O - https://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -' + - 'sh -c "echo deb https://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main >> /etc/apt/sources.list.d/postgresql.list"' + - 'sudo apt-get update' - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8' + CONFIG: trace_limit: 200 \ No newline at end of file diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index f39f642..007ef5d 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,44 +1,45 @@ require 'beaker-rspec' require 'beaker/puppet_install_helper' require 'beaker/module_install_helper' hosts.each do |host| if host['platform'] =~ /debian/ on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc' end #install_puppet if host['platform'] =~ /el-(5|6|7)/ relver = $1 on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-pc1-el-#{relver}.noarch.rpm" on host, 'yum install -y puppetserver' elsif host['platform'] =~ /fedora-(\d+)/ relver = $1 on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-pc1-fedora-#{relver}.noarch.rpm" on host, 'yum install -y puppetserver' elsif host['platform'] =~ /(ubuntu|debian)/ if ! host.check_for_package 'curl' on host, 'apt-get install -y curl' end + on host, 'apt-get install apt-transport-https --assume-yes' on host, 'curl -O http://apt.puppetlabs.com/puppetlabs-release-pc1-$(lsb_release -c -s).deb' on host, 'dpkg -i puppetlabs-release-pc1-$(lsb_release -c -s).deb' on host, 'apt-get -y -m update' on host, 'apt-get install -y puppetserver' else raise "install_puppet() called for unsupported platform '#{host['platform']}' on '#{host.name}'" end end run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no' install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i install_module_on(hosts) install_module_dependencies_on(hosts) RSpec.configure do |c| # Readable test descriptions c.formatter = :documentation hosts.each do |host| if host[:platform] =~ %r{el-7-x86_64} && host[:hypervisor] =~ %r{docker} on(host, "sed -i '/nodocs/d' /etc/yum.conf") end end end