From bb54ff3af348568c446205c06d6a6beaaaba7c1d Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 7 Jul 2020 16:28:10 +0200 Subject: Improve vIMS service order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems fixing the last side effects. Change-Id: Iee8506c2f0048f7c2619b772aea815288a40145e Signed-off-by: Cédric Ollivier (cherry picked from commit f7b45c10ef78a96f33568d2480ca79efbbd72505) --- functest_kubernetes/ims/astaire-depl.yaml | 4 ++-- functest_kubernetes/ims/cassandra-depl.yaml | 6 ------ functest_kubernetes/ims/chronos-depl.yaml | 4 ++-- functest_kubernetes/ims/homestead-prov-depl.yaml | 4 ++-- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/functest_kubernetes/ims/astaire-depl.yaml b/functest_kubernetes/ims/astaire-depl.yaml index 28f70cc5..31a85f22 100644 --- a/functest_kubernetes/ims/astaire-depl.yaml +++ b/functest_kubernetes/ims/astaire-depl.yaml @@ -14,9 +14,9 @@ spec: spec: terminationGracePeriodSeconds: 120 initContainers: - - name: wait-on-etcd + - name: wait-on-cassandra image: busybox:1.28 - command: ['sh', '-c', 'until nslookup etcd; do echo waiting for etcd 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-astaire:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/cassandra-depl.yaml b/functest_kubernetes/ims/cassandra-depl.yaml index 4e415ad7..b2053ed5 100644 --- a/functest_kubernetes/ims/cassandra-depl.yaml +++ b/functest_kubernetes/ims/cassandra-depl.yaml @@ -16,12 +16,6 @@ spec: - name: wait-on-etcd image: busybox:1.28 command: ['sh', '-c', 'until nslookup etcd; do echo waiting for etcd 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'] - - name: wait-on-chronos - image: busybox:1.28 - command: ['sh', '-c', 'until nslookup chronos; do echo waiting for chronos to start ...; sleep 2; done'] containers: - image: "ollivier/clearwater-cassandra:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/chronos-depl.yaml b/functest_kubernetes/ims/chronos-depl.yaml index fd891f1a..906d135d 100644 --- a/functest_kubernetes/ims/chronos-depl.yaml +++ b/functest_kubernetes/ims/chronos-depl.yaml @@ -16,9 +16,9 @@ spec: spec: terminationGracePeriodSeconds: 120 initContainers: - - name: wait-on-etcd + - name: wait-on-cassandra image: busybox:1.28 - command: ['sh', '-c', 'until nslookup etcd; do echo waiting for etcd 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-chronos:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/homestead-prov-depl.yaml b/functest_kubernetes/ims/homestead-prov-depl.yaml index a934cb7e..389fe5c5 100644 --- a/functest_kubernetes/ims/homestead-prov-depl.yaml +++ b/functest_kubernetes/ims/homestead-prov-depl.yaml @@ -14,9 +14,9 @@ spec: snmp: enabled spec: initContainers: - - name: wait-on-sprout + - name: wait-on-homestead 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 homestead; do echo waiting for homestead to start ...; sleep 2; done'] containers: - image: "ollivier/clearwater-homestead-prov:latest" imagePullPolicy: Always -- cgit 1.2.3-korg