From: Georg Kunz <georg.kunz@ericsson.com>
Date: Thu, 26 Jul 2018 12:10:07 +0000 (+0200)
Subject: [dovetail] Querying correct control node IPs
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=51585fe8e22db608ae7fde68a0dd81a1f9122bce

[dovetail] Querying correct control node IPs

The parameter used to query the host IPs of the database and message
queue hosts was wrong, resulting in the corresponding HA tests to fail.

Change-Id: I460209c63928ac99d5449adba03474fdf066ebcf
Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
---

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index c92ebba02..3268760d6 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -134,10 +134,10 @@ if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_T
             "sudo salt 'cmp001*' pillar.get _param:openstack_control_address --out text| \
                 cut -f2 -d' '")
     fuel_dbs_ip=$(ssh 2>/dev/null ${fuel_ctl_ssh_options} "${ssh_user}@${INSTALLER_IP}" \
-            "sudo salt 'dbs01*' pillar.get _param:openstack_control_address --out text| \
+            "sudo salt 'dbs01*' pillar.get _param:openstack_database_node01_address --out text| \
                 cut -f2 -d' '")
     fuel_msg_ip=$(ssh 2>/dev/null ${fuel_ctl_ssh_options} "${ssh_user}@${INSTALLER_IP}" \
-            "sudo salt 'msg01*' pillar.get _param:openstack_control_address --out text| \
+            "sudo salt 'msg01*' pillar.get _param:openstack_message_queue_node01_address --out text| \
                 cut -f2 -d' '")
     ipmi_index=$(ssh 2>/dev/null ${fuel_ctl_ssh_options} "${ssh_user}@${INSTALLER_IP}" \
             "sudo salt 'ctl*' network.ip_addrs cidr=${fuel_ctl_ip} --out text | grep ${fuel_ctl_ip} | cut -c 5")