Merge branch 'testing'

manifests/satosa.pp

@@ -33,14 +33,11 @@ class sunetdrive::satosa($dehydrated_name=undef,$image='docker.sunet.se/satosa',
     undef   => 'absent',
     default => 'present'
   }
-  sunet::docker_run {'alwayshttps':
-    ensure => 'absent'
-  }
-  sunet::docker_run {'satosa':
-    ensure => 'absent'
+  file {'/opt/docker_run':
+    ensure => 'absent',
   }
   sunet::docker_compose { 'satosa':
-    content          => template('satosa/docker-compose.yml.erb'),
+    content          => template('sunetdrive/satosa/docker-compose.yml.erb'),
     service_name     => 'satosa',
     compose_dir      => '/opt/',
     compose_filename => 'docker-compose.yml',