summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-24 08:27:07 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-24 08:27:07 +0200
commitd6c35419e1e72d45c6ccaea0fb213cea9a234e55 (patch)
treeeba52f7029f66da4e1307894a07ae932ef164efe /global/overlay/etc/puppet
parent40714a38deaef016bc92705955dea38b09f87b88 (diff)
don't run docker unless metadata existssunet-ops-2015-09-24-v05
Diffstat (limited to 'global/overlay/etc/puppet')
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp4
1 files changed, 1 insertions, 3 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 38668b9..232b1b3 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -230,6 +230,7 @@ class swamid_metadata {
}
class swamid_static_signer {
+ ensure_resource('class', 'sunet::dockerhost', {})
class { 'swamid_metadata': } ->
file { '/opt/published-metadata': ensure => directory } ->
cron { 'publish-swamid-metadata':
@@ -237,9 +238,6 @@ class swamid_static_signer {
user => root,
minute => '*/5'
} ->
- class {'ensure-dockerhost':
- ensure_resource('class', 'sunet::dockerhost', {})
- } ->
sunet::docker_run {'swamid_mds':
image => 'docker.sunet.se/swamid-mds',
imagetag => 'latest',