Fix issue with K8s and Openstack in same env
The targeting of mcp.Validate.runContainerConfiguration is incorrect it
makes an incorrect assumption that there will only be openstack nodes
called ctl01.
This patch fixes the issue by utilizing salt.pillar instead to get the
correct data.
Change-Id: If044f72c9f3f2e76feccd866a23c264681685d34
diff --git a/src/com/mirantis/mcp/Validate.groovy b/src/com/mirantis/mcp/Validate.groovy
index a7a870d..19cb4ca 100644
--- a/src/com/mirantis/mcp/Validate.groovy
+++ b/src/com/mirantis/mcp/Validate.groovy
@@ -20,10 +20,8 @@
def output_file = 'docker.log'
def nodes = getNodeList(master)
def nodes_hw = getNodeList(master, 'G@virtual:physical')
- def controller = salt.minionPresent(master, 'I@salt:master', 'ctl01', true, null, true, 200, 1)['return'][0].values()[0]
- def _pillar = salt.cmdRun(master, 'I@salt:master', "reclass-salt -o json -p ${controller} | " +
- "python -c 'import json,sys; print(json.dumps(json.loads(sys.stdin.read())[\"keystone\"][\"server\"]))'")
- def keystone = common.parseJSON(_pillar['return'][0].values()[0])
+ def _pillar = salt.getPillar(master, 'I@keystone:server', 'keystone:server')
+ def keystone = _pillar['return'][0].values()[0]
def ssh_key = getFileContent(master, 'I@salt:master', '/root/.ssh/id_rsa')
salt.cmdRun(master, target, "docker run -tid --net=host --name=qa_tools " +
" ${spt_variables} " +