From 7e45062745ee2d1f634748ca4c0880f5f1ae7691 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 9 Jul 2020 17:10:28 +0200 Subject: Boot Ellis once homestead-depl is ready MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If61a36020f3dfa5ba0a9858df769138257f9ec94 Signed-off-by: Cédric Ollivier (cherry picked from commit 5bc18405d75e9d765cd707ff9a98c3553de4b0dd) --- functest_kubernetes/ims/ellis-depl.yaml | 7 +++++-- functest_kubernetes/ims/homer-depl.yaml | 4 ++-- functest_kubernetes/ims/homestead-depl.yaml | 7 +++++-- functest_kubernetes/ims/ralf-depl.yaml | 4 ++-- functest_kubernetes/ims/sprout-depl.yaml | 10 ++++++++-- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/functest_kubernetes/ims/ellis-depl.yaml b/functest_kubernetes/ims/ellis-depl.yaml index 166774b6..4d7953ff 100644 --- a/functest_kubernetes/ims/ellis-depl.yaml +++ b/functest_kubernetes/ims/ellis-depl.yaml @@ -13,9 +13,12 @@ spec: service: ellis spec: initContainers: - - name: wait-on-cassandra + - name: wait-on-homestead-prov image: busybox:1.28 - command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done'] + command: ['sh', '-c', 'until nslookup homestead-prov; do echo waiting for homestead-prov to start ...; sleep 2; done'] + - name: wait-on-sprout + image: busybox:1.28 + command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done'] containers: - image: "ollivier/clearwater-ellis:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/homer-depl.yaml b/functest_kubernetes/ims/homer-depl.yaml index 6f0434d0..d4c90c94 100644 --- a/functest_kubernetes/ims/homer-depl.yaml +++ b/functest_kubernetes/ims/homer-depl.yaml @@ -13,9 +13,9 @@ spec: service: homer spec: initContainers: - - name: wait-on-sprout + - name: wait-on-cassandra image: busybox:1.28 - command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done'] + command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done'] containers: - image: "ollivier/clearwater-homer:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/homestead-depl.yaml b/functest_kubernetes/ims/homestead-depl.yaml index 142a47e5..f6c554df 100644 --- a/functest_kubernetes/ims/homestead-depl.yaml +++ b/functest_kubernetes/ims/homestead-depl.yaml @@ -14,9 +14,12 @@ spec: snmp: enabled spec: initContainers: - - name: wait-on-sprout + - name: wait-on-cassandra image: busybox:1.28 - command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done'] + command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done'] + - name: wait-on-astaire + image: busybox:1.28 + command: ['sh', '-c', 'until nslookup astaire; do echo waiting for astaire to start ...; sleep 2; done'] containers: - image: "ollivier/clearwater-homestead:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/ralf-depl.yaml b/functest_kubernetes/ims/ralf-depl.yaml index 829e6359..82bf525d 100644 --- a/functest_kubernetes/ims/ralf-depl.yaml +++ b/functest_kubernetes/ims/ralf-depl.yaml @@ -14,9 +14,9 @@ spec: snmp: enabled spec: initContainers: - - name: wait-on-sprout + - name: wait-on-cassandra image: busybox:1.28 - command: ['sh', '-c', 'until nslookup sprout; do echo waiting for sprout to start ...; sleep 2; done'] + command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done'] containers: - image: "ollivier/clearwater-ralf:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/sprout-depl.yaml b/functest_kubernetes/ims/sprout-depl.yaml index af6bc660..93e16f55 100644 --- a/functest_kubernetes/ims/sprout-depl.yaml +++ b/functest_kubernetes/ims/sprout-depl.yaml @@ -14,9 +14,15 @@ spec: snmp: enabled spec: initContainers: - - name: wait-on-cassandra + - name: wait-on-ralf image: busybox:1.28 - command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done'] + command: ['sh', '-c', 'until nslookup ralf; do echo waiting for ralf to start ...; sleep 2; done'] + - name: wait-on-chronos + image: busybox:1.28 + command: ['sh', '-c', 'until nslookup chronos; do echo waiting for chronos to start ...; sleep 2; done'] + - name: wait-on-homestead + image: busybox:1.28 + command: ['sh', '-c', 'until nslookup homestead; do echo waiting for homestead to start ...; sleep 2; done'] containers: - image: "ollivier/clearwater-sprout:latest" imagePullPolicy: Always -- cgit 1.2.3-korg