Improve vIMS service order

It seems fixing the last side effects.

Change-Id: Iee8506c2f0048f7c2619b772aea815288a40145e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit f7b45c10ef78a96f33568d2480ca79efbbd72505)

diff --git a/functest_kubernetes/ims/astaire-depl.yaml b/functest_kubernetes/ims/astaire-depl.yaml
index 28f70cc..31a85f2 100644 (file)
--- 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 4e415ad..b2053ed 100644 (file)
--- 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 fd891f1..906d135 100644 (file)
--- 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 a934cb7..389fe5c 100644 (file)
--- 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