From 86b1cfc23eca3be9432bd94db3d7f56b55fef1bd Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Mon, 6 Jul 2020 20:09:41 +0200 Subject: [PATCH] Manage Ims service dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I6647d9acfabd2ce2d12ff2f30393c2de8f6165ff Signed-off-by: Cédric Ollivier (cherry picked from commit 68b2a9ac43003840ae0b88bf3b2cd6c1fc10db21) --- functest_kubernetes/ims/astaire-depl.yaml | 4 ++++ functest_kubernetes/ims/bono-depl.yaml | 4 ++++ functest_kubernetes/ims/cassandra-depl.yaml | 10 ++++++++++ functest_kubernetes/ims/chronos-depl.yaml | 4 ++++ functest_kubernetes/ims/ellis-depl.yaml | 4 ++++ functest_kubernetes/ims/homer-depl.yaml | 4 ++++ functest_kubernetes/ims/homestead-depl.yaml | 4 ++++ functest_kubernetes/ims/homestead-prov-depl.yaml | 4 ++++ functest_kubernetes/ims/ims.py | 2 ++ functest_kubernetes/ims/ralf-depl.yaml | 4 ++++ functest_kubernetes/ims/sprout-depl.yaml | 4 ++++ 11 files changed, 48 insertions(+) diff --git a/functest_kubernetes/ims/astaire-depl.yaml b/functest_kubernetes/ims/astaire-depl.yaml index 288f6ab8..28f70cc5 100644 --- a/functest_kubernetes/ims/astaire-depl.yaml +++ b/functest_kubernetes/ims/astaire-depl.yaml @@ -13,6 +13,10 @@ spec: service: astaire spec: terminationGracePeriodSeconds: 120 + initContainers: + - name: wait-on-etcd + image: busybox:1.28 + command: ['sh', '-c', 'until nslookup etcd; do echo waiting for etcd to start ...; sleep 2; done'] containers: - image: "ollivier/clearwater-astaire:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/bono-depl.yaml b/functest_kubernetes/ims/bono-depl.yaml index a6fe2f9e..8df33bc8 100644 --- a/functest_kubernetes/ims/bono-depl.yaml +++ b/functest_kubernetes/ims/bono-depl.yaml @@ -13,6 +13,10 @@ spec: service: bono snmp: enabled spec: + initContainers: + - 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-bono:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/cassandra-depl.yaml b/functest_kubernetes/ims/cassandra-depl.yaml index 053bd3f3..4e415ad7 100644 --- a/functest_kubernetes/ims/cassandra-depl.yaml +++ b/functest_kubernetes/ims/cassandra-depl.yaml @@ -12,6 +12,16 @@ spec: labels: service: cassandra spec: + initContainers: + - 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 e5ec00c1..fd891f1a 100644 --- a/functest_kubernetes/ims/chronos-depl.yaml +++ b/functest_kubernetes/ims/chronos-depl.yaml @@ -15,6 +15,10 @@ spec: service: chronos spec: terminationGracePeriodSeconds: 120 + initContainers: + - name: wait-on-etcd + image: busybox:1.28 + command: ['sh', '-c', 'until nslookup etcd; do echo waiting for etcd to start ...; sleep 2; done'] containers: - image: "ollivier/clearwater-chronos:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/ellis-depl.yaml b/functest_kubernetes/ims/ellis-depl.yaml index 694c813a..166774b6 100644 --- a/functest_kubernetes/ims/ellis-depl.yaml +++ b/functest_kubernetes/ims/ellis-depl.yaml @@ -12,6 +12,10 @@ spec: labels: service: ellis spec: + initContainers: + - name: wait-on-cassandra + image: busybox:1.28 + command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra 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 f202ebab..6f0434d0 100644 --- a/functest_kubernetes/ims/homer-depl.yaml +++ b/functest_kubernetes/ims/homer-depl.yaml @@ -12,6 +12,10 @@ spec: labels: service: homer spec: + initContainers: + - 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-homer:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/homestead-depl.yaml b/functest_kubernetes/ims/homestead-depl.yaml index 2c447635..142a47e5 100644 --- a/functest_kubernetes/ims/homestead-depl.yaml +++ b/functest_kubernetes/ims/homestead-depl.yaml @@ -13,6 +13,10 @@ spec: service: homestead snmp: enabled spec: + initContainers: + - 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-homestead:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/homestead-prov-depl.yaml b/functest_kubernetes/ims/homestead-prov-depl.yaml index 2e5821d8..a934cb7e 100644 --- a/functest_kubernetes/ims/homestead-prov-depl.yaml +++ b/functest_kubernetes/ims/homestead-prov-depl.yaml @@ -13,6 +13,10 @@ spec: service: homestead-prov snmp: enabled spec: + initContainers: + - 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-homestead-prov:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/ims.py b/functest_kubernetes/ims/ims.py index d1882a92..8fc5adc5 100644 --- a/functest_kubernetes/ims/ims.py +++ b/functest_kubernetes/ims/ims.py @@ -9,6 +9,8 @@ """Deploy and Test Clearwater vIMS using Kubernetes""" +from __future__ import division + import logging import time import re diff --git a/functest_kubernetes/ims/ralf-depl.yaml b/functest_kubernetes/ims/ralf-depl.yaml index 839da428..829e6359 100644 --- a/functest_kubernetes/ims/ralf-depl.yaml +++ b/functest_kubernetes/ims/ralf-depl.yaml @@ -13,6 +13,10 @@ spec: service: ralf snmp: enabled spec: + initContainers: + - 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-ralf:latest" imagePullPolicy: Always diff --git a/functest_kubernetes/ims/sprout-depl.yaml b/functest_kubernetes/ims/sprout-depl.yaml index ab4d8acf..af6bc660 100644 --- a/functest_kubernetes/ims/sprout-depl.yaml +++ b/functest_kubernetes/ims/sprout-depl.yaml @@ -13,6 +13,10 @@ spec: service: sprout snmp: enabled spec: + initContainers: + - name: wait-on-cassandra + image: busybox:1.28 + command: ['sh', '-c', 'until nslookup cassandra; do echo waiting for cassandra to start ...; sleep 2; done'] containers: - image: "ollivier/clearwater-sprout:latest" imagePullPolicy: Always -- 2.16.6