Merge "Fix calico tes suite"
diff --git a/tcp_tests/managers/sl_manager.py b/tcp_tests/managers/sl_manager.py
index f3c4877..3d8de25 100644
--- a/tcp_tests/managers/sl_manager.py
+++ b/tcp_tests/managers/sl_manager.py
@@ -45,13 +45,13 @@
def get_sl_vip(self):
sl_vip_address_pillars = self._salt.get_pillar(
- tgt='I@keepalived:cluster:enabled:true and not ctl*',
+ tgt='I@prometheus:server:enabled:True',
pillar='keepalived:cluster:instance:prometheus_server_vip:address')
sl_vip_ip = set([ip
for item in sl_vip_address_pillars
for node, ip in item.items() if ip])
assert len(sl_vip_ip) == 1, (
- "Found more than one SL VIP in pillars:{0}, "
+ "SL VIP not found or found more than one SL VIP in pillars:{0}, "
"expected one!").format(sl_vip_ip)
sl_vip_ip_host = sl_vip_ip.pop()
return sl_vip_ip_host
diff --git a/tcp_tests/templates/ironic_standalone/underlay--user-data-ironic.yaml b/tcp_tests/templates/ironic_standalone/underlay--user-data-ironic.yaml
index 1d2d6a5..dcc2933 100644
--- a/tcp_tests/templates/ironic_standalone/underlay--user-data-ironic.yaml
+++ b/tcp_tests/templates/ironic_standalone/underlay--user-data-ironic.yaml
@@ -53,6 +53,9 @@
- which wget >/dev/null || (apt-get update; apt-get install -y wget);
- apt-get install -y ntp
+ #Installing mysql before running formula for correct mysql status
+ - DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server-5.7 python-mysqldb debconf-utils
+
- export IRONIC_PXE_MANAGER=dnsmasq
- export IRONIC_PXE_INTERFACE_NAME=ens4
- export IRONIC_PXE_INTERFACE_ADDRESS={{ os_env('IRONIC_PXE_INTERFACE_ADDRESS', '10.0.175.2') }}