Merge branch 'master' of git.nordu.net:nunoc-opssunet-ops-2015-09-17-v01

1 files changed, 15 insertions, 15 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index d4bd72c..375a36b 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -31,6 +31,9 @@ class mailclient ($domain) {
 
 # you need a default node, all nodes need ssh + ufw
 node default {
+}
+
+class nunoc {
   include sshaccess
   if $::hostname !~ /random/ {
      include sunet::simple_entropy
@@ -115,29 +118,26 @@ node 'reep.tid.isoc.org' {
 }
 
 node 'datasets.sunet.se' {
-   docker::image {'dockerfile/redis': }
-   docker::image {'docker.sunet.se/datasets': }
+   class {'sunet::dockerhost': } ->
    file {'/opt/lobo2-redis-data':
       ensure => 'directory',
-   }
+   } ->
    file {'/etc/ssl':
       ensure => 'directory',
-   }
-   docker::run {'redis':
-      image    => 'dockerfile/redis',
-      use_name => true,
+   } ->
+   user { 'redis': ensure => exists, system => true } ->
+   sunet::docker_run {'datasets-redis':
+      image    => 'redis',
+      imagetag => 'latest',
       volumes  => ['/opt/lobo2-redis-data:/data','/var/log:/var/log'],
-      verify_checksum => false,
-   }
-   docker::run {'datasets':
+   } ->
+   sunet::docker_run {'datasets':
       image    => 'docker.sunet.se/datasets',
-      use_name => true,
-      env      => ['BASE_URL=https://datasets.sunet.se'],
+      imagetag => 'latest',
       volumes  => ['/etc/ssl:/etc/ssl','/var/log:/var/log'],
       ports    => ['80:80','443:443'],
-      links    => ['redis:redis'],
-      start_on => 'docker-redis',
-      verify_checksum => false,
+      env      => ["REDIS_PORT=tcp://datasets-redis.docker:6379",'BASE_URL=https://datasets.sunet.se'],
+      start_on => 'docker-datasets-redis'
    }
 }