This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-muchos.git
The following commit(s) were added to refs/heads/master by this push:
new 25cdb1b Correctly check for Docker swarm status (#346)
25cdb1b is described below
commit 25cdb1b79eb6820be84397b7ec7a49b23309dc2f
Author: Arvind Shyamsundar <[email protected]>
AuthorDate: Fri May 8 08:09:52 2020 -0700
Correctly check for Docker swarm status (#346)
* Correctly check for Docker swarm status
Fixes #345 - which in turn was caused by extra whitespace now being
printed at the start of the line by `docker info`
* Do not attempt to stop docker on azure_proxy_host
As the docker role is only installed on workers and swarmmanager the
cluster wipe fails when it attempts to stop Docker on the Azure proxy
host machine. This PR changes wipe to exclude said proxy host.
* Make grep and sed regex more specific
Co-authored-by: Keith Turner <[email protected]>
* Apply more specific grep and sed pattern to workers
Co-authored-by: Keith Turner <[email protected]>
---
ansible/docker.yml | 4 ++--
ansible/kill.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ansible/docker.yml b/ansible/docker.yml
index b8322bf..f33ff13 100644
--- a/ansible/docker.yml
+++ b/ansible/docker.yml
@@ -24,7 +24,7 @@
tasks:
- name: get swarm status
shell: >
- set -o pipefail && docker info | egrep '^Swarm: ' | cut -d ' ' -f 2
+ set -o pipefail && docker info | grep 'Swarm:' | sed
's/\s*Swarm\:\s*//'
args:
executable: bash
register: swarm_status
@@ -45,7 +45,7 @@
tasks:
- name: get swarm status
shell: >
- set -o pipefail && docker info | egrep '^Swarm: ' | cut -d ' ' -f 2
+ set -o pipefail && docker info | grep 'Swarm:' | sed
's/\s*Swarm\:\s*//'
args:
executable: bash
register: swarm_status
diff --git a/ansible/kill.yml b/ansible/kill.yml
index 26a9abc..93c984f 100644
--- a/ansible/kill.yml
+++ b/ansible/kill.yml
@@ -30,7 +30,7 @@
- name: "stop mesos slaves"
service: name=mesos-slave state=stopped
when: "'mesosmaster' in groups"
-- hosts: all
+- hosts: all:!{{ azure_proxy_host }}
become: yes
tasks:
- name: "stop docker"
