From d5a71eb2d1a570973e85820a31c99fd0b9a41e47 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Thu, 20 Jul 2017 11:47:50 +0300 Subject: [PATCH] Simplify master-worker relation missing message --- .../layers/kubernetes-master/reactive/kubernetes_master.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index 9c3a0b387d2..a51add3d170 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -398,17 +398,14 @@ def send_tokens(kube_control): @when_not('kube-control.connected') def missing_kube_control(): - """Inform the operator they need to add the kube-control relation. + """Inform the operator master is waiting for a relation to workers. If deploying via bundle this won't happen, but if operator is upgrading a a charm in a deployment that pre-dates the kube-control relation, it'll be missing. """ - hookenv.status_set( - 'blocked', - 'Relate {}:kube-control kubernetes-worker:kube-control'.format( - hookenv.service_name())) + hookenv.status_set('blocked', 'Waiting for workers.') @when('kube-api-endpoint.available')