diff options
| -rw-r--r-- | global/overlay/etc/puppet/cosmos-modules.conf | 1 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 8 | ||||
| -rw-r--r-- | sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces | 27 |
3 files changed, 26 insertions, 10 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' { diff --git a/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces b/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces index 5eca717..4490f48 100644 --- a/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces +++ b/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces @@ -5,20 +5,27 @@ auto lo iface lo inet loopback -# The primary network interface auto eth0 -iface eth0 inet static - address 130.242.125.5 +iface eth0 inet manual + +# The primary network interface +auto br0 +iface br0 inet static + address 130.242.125.71 netmask 255.255.255.192 - network 130.242.125.0 - broadcast 130.242.125.63 - gateway 130.242.125.1 + network 130.242.125.64 + broadcast 130.242.125.127 + gateway 130.242.125.65 # dns-* options are implemented by the resolvconf package, if installed dns-nameservers 130.242.80.14 130.242.80.99 dns-search swamid.se + bridge_ports eth0 + bridge_fd 9 + bridge_hello 2 + bridge_maxage 12 -iface eth0 inet6 static - address 2001:6b0:8:3::5 - netmask 64 - gateway 2001:6b0:8:3::1 +#iface eth0 inet6 static +# address 2001:6b0:8:3::5 +# netmask 64 +# gateway 2001:6b0:8:3::1 |