summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-05-26 14:21:18 +0200
committerLeif Johansson <leifj@sunet.se>2015-05-26 14:21:18 +0200
commit097a6fd80db407d614c52d4cec70817fbc14e4cc (patch)
tree5d271d2e56bb27ca1fb375ee015c9131b04c32c1
parentd284dcced21429aa414f21b4f5e67bdebc651971 (diff)
logname as argument to containersct-ops-2015-05-26-v02
-rw-r--r--global/overlay/etc/puppet/manifests/catlfish/frontend.pp2
-rw-r--r--global/overlay/etc/puppet/manifests/catlfish/merge.pp2
-rw-r--r--global/overlay/etc/puppet/manifests/catlfish/signing.pp2
-rw-r--r--global/overlay/etc/puppet/manifests/catlfish/storage.pp2
4 files changed, 4 insertions, 4 deletions
diff --git a/global/overlay/etc/puppet/manifests/catlfish/frontend.pp b/global/overlay/etc/puppet/manifests/catlfish/frontend.pp
index e441083..2ae63d0 100644
--- a/global/overlay/etc/puppet/manifests/catlfish/frontend.pp
+++ b/global/overlay/etc/puppet/manifests/catlfish/frontend.pp
@@ -26,7 +26,7 @@ define catlfish::frontend(
imagetag => $version,
ports => ["8080:8080","8082:8082"],
volumes => ["/usr/local/etc/catlfish:/usr/local/etc/catlfish:ro","${db}:/var/local/db/catlfish"],
- command => ["frontend ${name}"]
+ command => ["frontend ${name} ${logname}"]
} ->
ufw::allow { "${name}-allow-http":
ip => 'any',
diff --git a/global/overlay/etc/puppet/manifests/catlfish/merge.pp b/global/overlay/etc/puppet/manifests/catlfish/merge.pp
index 9334b09..2a54724 100644
--- a/global/overlay/etc/puppet/manifests/catlfish/merge.pp
+++ b/global/overlay/etc/puppet/manifests/catlfish/merge.pp
@@ -13,6 +13,6 @@ define catlfish::merge(
env => ["MERGE_EXTRA_ARGS=--timing","MERGE_DB_DIR=/var/local/db/catlfish"],
imagetag => $version,
volumes => ["/usr/local/etc/catlfish/${name}:/usr/local/etc/catlfish:ro","${db}:/var/local/db/catlfish"],
- command => ["merge ${name}"]
+ command => ["merge ${name} ${logname}"]
}
}
diff --git a/global/overlay/etc/puppet/manifests/catlfish/signing.pp b/global/overlay/etc/puppet/manifests/catlfish/signing.pp
index bef855b..70f1d87 100644
--- a/global/overlay/etc/puppet/manifests/catlfish/signing.pp
+++ b/global/overlay/etc/puppet/manifests/catlfish/signing.pp
@@ -9,7 +9,7 @@ define catlfish::signing(
imagetag => $version,
volumes => ["/usr/local/etc/catlfish:/usr/local/etc/catlfish:ro"],
ports => ["8188:8188"],
- command => ["signing ${name}"]
+ command => ["signing ${name} ${logname}"]
}
ufw:allow { "${name}-allow-8188-acl0":
ip => '130.242.125.0/24',
diff --git a/global/overlay/etc/puppet/manifests/catlfish/storage.pp b/global/overlay/etc/puppet/manifests/catlfish/storage.pp
index 2e7191e..f7b7de5 100644
--- a/global/overlay/etc/puppet/manifests/catlfish/storage.pp
+++ b/global/overlay/etc/puppet/manifests/catlfish/storage.pp
@@ -13,7 +13,7 @@ define catlfish::storage(
imagetag => $version,
volumes => ["/usr/local/etc/catlfish:/usr/local/etc/catlfish:ro","${db}:/var/local/db/catlfish"],
ports => ["8081:8081"],
- command => ["storage ${name}"]
+ command => ["storage ${name} ${logname}"]
}
ufw:allow { "${name}-allow-8081-acl0":
ip => '130.242.125.0/24',