X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fpol-k8s%2Freactive%2Fpol_k8s.py;h=5d56c27d48cdcfea17ccb0a9ed30342c798e2913;hb=5757a98a65448a05537518dc8bb92b4fa4342759;hp=c31a3231a6faa77f8068cc6c0cfdbfaba5a9b075;hpb=82c5ffa15e1abb4c7ff58dc489f22cbe276c78c3;p=osm%2Fdevops.git diff --git a/installers/charm/pol-k8s/reactive/pol_k8s.py b/installers/charm/pol-k8s/reactive/pol_k8s.py index c31a3231..5d56c27d 100644 --- a/installers/charm/pol-k8s/reactive/pol_k8s.py +++ b/installers/charm/pol-k8s/reactive/pol_k8s.py @@ -32,12 +32,14 @@ def restart(): @when_not("kafka.ready") +@when("leadership.is_leader") @when_not("pol-k8s.configured") def waiting_for_kafka(): layer.status.waiting("Waiting for kafka to be ready") @when_not("mongo.ready") +@when("leadership.is_leader") @when_not("pol-k8s.configured") def waiting_for_mongo(): layer.status.waiting("Waiting for mongo to be ready") @@ -69,6 +71,12 @@ def configure(): layer.status.blocked("k8s spec failed to deploy: {}".format(e)) +@when("kafka.ready", "mongo.ready") +@when_not("leadership.is_leader") +def non_leaders_active(): + layer.status.active("ready") + + @when("pol-k8s.configured") def set_pol_active(): layer.status.active("ready") @@ -92,7 +100,6 @@ def make_pod_spec(kafka_host, kafka_port, mongo_uri): cfg = config() data = { "name": md.get("name"), - "docker_image": cfg.get("image"), "kafka_host": kafka_host, "kafka_port": kafka_port, "mongo_uri": mongo_uri,