summaryrefslogtreecommitdiff
path: root/global
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2014-05-16 13:21:04 +0200
committerLeif Johansson <leifj@sunet.se>2014-05-16 13:21:04 +0200
commit2f2916e15a0f493b72d5cbb0f24ddbc76602b48e (patch)
treebc263de88538f22df2cacf1e0d51f0bb1866e219 /global
parentbc58a8b82bc2b09c3b9f8ade3b288b0e21e3b192 (diff)
ip address fix for kvm1 and more modulessunet-ops-2014-05-16-v01
Diffstat (limited to 'global')
-rw-r--r--global/overlay/etc/puppet/cosmos-modules.conf1
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp8
2 files changed, 9 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf
index f378327..7a95b31 100644
--- a/global/overlay/etc/puppet/cosmos-modules.conf
+++ b/global/overlay/etc/puppet/cosmos-modules.conf
@@ -21,3 +21,4 @@ wordpress hunner/wordpress no
mysql puppetlabs/mysql no
apache puppetlabs/apache no
pyff git://github.com/samlbits/puppet-pyff.git yes sunet-*
+postgresql git://github.com/SUNET/puppetlabs-postgresql.git yes sunet-*
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index f17a254..ab60653 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -73,6 +73,14 @@ node 'registry.swamid.se' {
python::pip { 'peer==0.13.0':
virtualenv => '/opt/peer'
}
+
+ class { 'postgresql::server': }
+
+ postgresql::server::db { 'peer':
+ encoding => 'utf-8',
+ user => 'peer',
+ password => postgresql_password('peer', hiera('peer_db_password')),
+ }
}
node 'sto-tug-kvm-lab1.swamid.se' {