Merge pull request #1550 from openshift-cherrypick-robot/cherry-pick-…

…1380-to-release-4.4 Bug 1810996: [release-4.4] Fixed hardcoded ingress VIP password
openshift · Mar 30, 2020 · a73c420 · a73c420
2 parents 3e0c2fc + 0eca571
commit a73c420
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/templates/master/00-master/baremetal/files/baremetal-keepalived-keepalived.yaml b/templates/master/00-master/baremetal/files/baremetal-keepalived-keepalived.yaml
@@ -67,7 +67,7 @@ contents:
         advert_int 1
         authentication {
             auth_type PASS
-            auth_pass cluster_uuid_ingress_vip
+            auth_pass {{`{{ .Cluster.Name }}`}}_ingress_vip
         }
         virtual_ipaddress {
             {{`{{ .Cluster.IngressVIP }}`}}/{{`{{ .Cluster.VIPNetmask }}`}}

diff --git a/templates/master/00-master/openstack/files/openstack-keepalived-keepalived.yaml b/templates/master/00-master/openstack/files/openstack-keepalived-keepalived.yaml
@@ -62,7 +62,7 @@ contents:
         advert_int 1
         authentication {
             auth_type PASS
-            auth_pass cluster_uuid_ingress_vip
+            auth_pass {{`{{ .Cluster.Name }}`}}_ingress_vip
         }
         virtual_ipaddress {
             {{`{{ .Cluster.IngressVIP }}`}}/{{`{{ .Cluster.VIPNetmask }}`}}

diff --git a/templates/master/00-master/ovirt/files/ovirt-keepalived-keepalived.yaml b/templates/master/00-master/ovirt/files/ovirt-keepalived-keepalived.yaml
@@ -67,7 +67,7 @@ contents:
         advert_int 1
         authentication {
             auth_type PASS
-            auth_pass cluster_uuid_ingress_vip
+            auth_pass {{`{{ .Cluster.Name }}`}}_ingress_vip
         }
         virtual_ipaddress {
             {{`{{ .Cluster.IngressVIP }}`}}/{{`{{ .Cluster.VIPNetmask }}`}}

diff --git a/templates/worker/00-worker/baremetal/files/baremetal-keepalived-keepalived.yaml b/templates/worker/00-worker/baremetal/files/baremetal-keepalived-keepalived.yaml
@@ -19,7 +19,7 @@ contents:
         advert_int 1
         authentication {
             auth_type PASS
-            auth_pass cluster_uuid_ingress_vip
+            auth_pass {{`{{ .Cluster.Name }}`}}_ingress_vip
         }
         virtual_ipaddress {
             {{`{{ .Cluster.IngressVIP }}`}}/{{`{{ .Cluster.VIPNetmask }}`}}

diff --git a/templates/worker/00-worker/openstack/files/openstack-keepalived-keepalived.yaml b/templates/worker/00-worker/openstack/files/openstack-keepalived-keepalived.yaml
@@ -18,7 +18,7 @@ contents:
         advert_int 1
         authentication {
             auth_type PASS
-            auth_pass cluster_uuid_ingress_vip
+            auth_pass {{`{{ .Cluster.Name }}`}}_ingress_vip
         }
         virtual_ipaddress {
             {{`{{ .Cluster.IngressVIP }}`}}/{{`{{ .Cluster.VIPNetmask }}`}}

diff --git a/templates/worker/00-worker/ovirt/files/ovirt-keepalived-keepalived.yaml b/templates/worker/00-worker/ovirt/files/ovirt-keepalived-keepalived.yaml
@@ -19,7 +19,7 @@ contents:
         advert_int 1
         authentication {
             auth_type PASS
-            auth_pass cluster_uuid_ingress_vip
+            auth_pass {{`{{ .Cluster.Name }}`}}_ingress_vip
         }
         virtual_ipaddress {
             {{`{{ .Cluster.IngressVIP }}`}}/{{`{{ .Cluster.VIPNetmask }}`}}