Hotfix: Remove docker ps cmd, wrong condition
The line don't count with pillar docker:host:enabled=False and execute
`docker ps` on hosts where docker was not installed.
This patch fixes customer facing bug, where infrastructure is behind proxy
then we globally define pillar docker:host:proxy, expecting hosts without enabled
docker:host will not interact.
Change-Id: I8452f45fdb8aa03a668da848c89b77b90e6b40cc
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index d9a50e8..45e5dea 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -202,7 +202,7 @@
// Install docker
if (salt.testTarget(master, "I@docker:host ${extra_tgt}")) {
salt.enforceState(master, "I@docker:host ${extra_tgt}", 'docker.host')
- salt.cmdRun(master, "I@docker:host ${extra_tgt}", 'docker ps')
+ salt.cmdRun(master, "I@docker:host:enabled:true ${extra_tgt}", 'docker ps')
}
// Install keepalived