Modifying new cookied model for baremetal
Removing openstack_telemetry (mdb) nodes due to this merge
https://github.com/Mirantis/mk2x-cookiecutter-reclass-model/commit/6191e302eecaf62451415ec2eeea992b28d11f71
Hack virouter
reboot cmp
change cookiecutter-contex to another file (with dpdk)
Change stacklight VIP determining
Move cinder lvm to computes
Add workarounds for cinder backend
Change-Id: I9bfe68a91723563bbd1507d6468b8f4b9efe2861
diff --git a/tcp_tests/managers/sl_manager.py b/tcp_tests/managers/sl_manager.py
index d66ee67..d6354b1 100644
--- a/tcp_tests/managers/sl_manager.py
+++ b/tcp_tests/managers/sl_manager.py
@@ -44,12 +44,20 @@
self.__config.stack_light.sl_vip_host = self.get_sl_vip()
def get_sl_vip(self):
- sl_vip_address_pillars = self._salt.get_pillar(
- tgt='I@prometheus:server:enabled:True',
- pillar='keepalived:cluster:instance:prometheus_server_vip:address')
+ tgt = 'I@prometheus:server:enabled:True'
+ pillar = 'keepalived:cluster:instance:prometheus_server_vip:address'
+ sl_vip_address_pillars = self._salt.get_pillar(tgt=tgt,
+ pillar=pillar)
sl_vip_ip = set([ip
for item in sl_vip_address_pillars
for node, ip in item.items() if ip])
+ if not sl_vip_ip:
+ pillar = 'keepalived:cluster:instance:VIP:address'
+ sl_vip_address_pillars = self._salt.get_pillar(tgt=tgt,
+ pillar=pillar)
+ 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, (
"SL VIP not found or found more than one SL VIP in pillars:{0}, "
"expected one!").format(sl_vip_ip)