Fix keepalived naming
To have working interpolation for keepalive instance
pillars, all keepalive instances must have the same
name 'VIP' to be interpolated in a single instance
instead of several instances with partial data.
Closes-Bug:#PROD-15923
Change-Id: Ib718c7dd8e81751436dfdab1355d79bbf6309996
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 7329d73..efd894b 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -313,11 +313,10 @@
retry: {count: 1, delay: 5}
skip_fail: false
-- description: "Workaround for PROD-14756: all roles must use service.keepalived.cluster.single with the default 'VIP' instance"
+- description: "Workaround for PROD-15923: all keepalive instances must be named 'VIP'"
cmd: |
set -e;
- find /srv/salt/reclass/classes/cluster/ -type f -exec sed -i 's/system.keepalived.*/service.keepalived.cluster.single/g' {} +
- find /srv/salt/reclass/classes/system/ -type f -exec sed -i 's/system.keepalived.*/service.keepalived.cluster.single/g' {} +
+ find /srv/salt/reclass/classes/{system,cluster}/ -name '*.yml' -type f -exec sed -ri '/^ keepalived:/{:1;N;/\n instance:/!b1 {N; /\n [[:graph:]]+:/ { s/\n instance:\n [[:graph:]]+:/\n instance:\n VIP:/ } } }' {} +
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}