Skip to content

Commit 98148f7

Browse files
committed
(PDB-3654) bump version and ini file dep
1 parent d3b1d16 commit 98148f7

4 files changed

Lines changed: 8 additions & 2 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ matrix:
2828
bundler_args: --without system_tests
2929
env: PUPPET_GEM_VERSION="~> 4.0"
3030
notifications:
31-
email: false
31+
email: false

manifests/database/postgresql.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
class { '::postgresql::server::contrib': }
2727
postgresql::server::extension { 'pg_trgm':
2828
database => $database_name,
29+
require => Postgresql::Server::Db[$database_name],
2930
}
3031
}
3132

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ HOSTS:
1010
docker_cmd: '["/sbin/init"]'
1111
docker_image_commands:
1212
# ensure that upstart is booting correctly in the container
13+
- 'wget -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -'
14+
- 'sh -c "echo deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main >> /etc/apt/sources.list.d/postgresql.list"'
15+
- 'sudo apt-get update'
1316
- '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'
17+
1418
CONFIG:
15-
trace_limit: 200
19+
trace_limit: 200

spec/spec_helper_acceptance.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
if ! host.check_for_package 'curl'
2020
on host, 'apt-get install -y curl'
2121
end
22+
on host, 'apt-get install apt-transport-https --assume-yes'
2223
on host, 'curl -O http://apt.puppetlabs.com/puppetlabs-release-pc1-$(lsb_release -c -s).deb'
2324
on host, 'dpkg -i puppetlabs-release-pc1-$(lsb_release -c -s).deb'
2425
on host, 'apt-get -y -m update'

0 commit comments

Comments
 (0)