(PDB-3654) bump version and ini file dep

Author: Zak-Kent

manifests/database/postgresql.pp

@@ -25,8 +25,8 @@
     # 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],
     }
   }
 

spec/acceptance/nodesets/docker/ubuntu-14.04.yml

@@ -10,6 +10,10 @@ HOSTS:
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
       # ensure that upstart is booting correctly in the container
+      - 'wget -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -'
+      - 'sh -c "echo deb http://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

spec/spec_helper_acceptance.rb

@@ -19,6 +19,7 @@
     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'