Merge pull request #49717 from wwwtyro/rye/block-on-failed-services

Automatic merge from submit-queue (batch tested with PRs 49712, 49694, 49714, 49670, 49717) set juju master charm state to blocked if the services appear to be failing **What this PR does / why we need it**: set the juju master charm state to blocked if the services appear to be failing **Release note**: ```release-note set the juju master charm state to blocked if the services appear to be failing ```

Merge pull request #49717 from wwwtyro/rye/block-on-failed-services
a9a9241d · Kubernetes Submit Queue · GitHub · 97f74e81 · 809a0abb · a9a9241d
Commit a9a9241d authored Jul 28, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

kubernetes_master.py ...ju/layers/kubernetes-master/reactive/kubernetes_master.py +1 -1

No files found.
--- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
+++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
@@ -329,7 +329,7 @@ def idle_status(kube_api, kube_control):
            hookenv.status_set('active', 'Kubernetes master running.')
        else:
            msg = 'Stopped services: {}'.format(','.join(failing_services))
-            hookenv.status_set('waiting', msg)
+            hookenv.status_set('blocked', msg)
 def master_services_down():