Skip to content

Commit f5b3b1f

Browse files
committed
Set interface name for vrrp config after enabling predicted names
Signed-off-by: Sunnatillo <sunnat.samadov@est.tech>
1 parent ddfafb4 commit f5b3b1f

6 files changed

+6
-6
lines changed

tests/roles/run_tests/templates/main/cluster-template-controlplane-kubeadm-config-centos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ files:
6060
6161
vrrp_instance VI_1 {
6262
state MASTER
63-
interface {% if EXTERNAL_VLAN_ID == "" %}eth1{% else %}eth0.{{ EXTERNAL_VLAN_ID }}{% endif %}
63+
interface {% if EXTERNAL_VLAN_ID == "" %}{{ bmh_nic_names[1] }}{% else %}{{ bmh_nic_names[0] }}.{{ EXTERNAL_VLAN_ID }}{% endif %}
6464
6565
virtual_router_id 1
6666
priority 101

tests/roles/run_tests/templates/main/cluster-template-controlplane-kubeadm-config-ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ files:
5656
renderer: networkd
5757
bridges:
5858
{{ IRONIC_ENDPOINT_BRIDGE }}:
59-
interfaces: [enp1s0]
59+
interfaces: [eth0]
6060
addresses:
6161
- {{ "{{ ds.meta_data.provisioningIP }}" }}/{{ "{{ ds.meta_data.provisioningCIDR }}" }}
6262
- path : /etc/containers/registries.conf

tests/roles/run_tests/templates/main/cluster-template-workers-kubeadm-config-ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ files:
1616
renderer: networkd
1717
bridges:
1818
{{ IRONIC_ENDPOINT_BRIDGE }}:
19-
interfaces: [enp1s0]
19+
interfaces: [eth0]
2020
addresses:
2121
- {{ "{{ ds.meta_data.provisioningIP }}" }}/{{ "{{ ds.meta_data.provisioningCIDR }}" }}
2222
- path : /etc/containers/registries.conf

tests/roles/run_tests/templates/release-1.10/cluster-template-controlplane-kubeadm-config-centos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ files:
6060
6161
vrrp_instance VI_1 {
6262
state MASTER
63-
interface {% if EXTERNAL_VLAN_ID == "" %}eth1{% else %}eth0.{{ EXTERNAL_VLAN_ID }}{% endif %}
63+
interface {% if EXTERNAL_VLAN_ID == "" %}{{ bmh_nic_names[1] }}{% else %}{{ bmh_nic_names[0] }}.{{ EXTERNAL_VLAN_ID }}{% endif %}
6464
6565
virtual_router_id 1
6666
priority 101

tests/roles/run_tests/templates/release-1.8/cluster-template-controlplane-kubeadm-config-centos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ files:
6060
6161
vrrp_instance VI_1 {
6262
state MASTER
63-
interface {% if EXTERNAL_VLAN_ID == "" %}eth1{% else %}eth0.{{ EXTERNAL_VLAN_ID }}{% endif %}
63+
interface {% if EXTERNAL_VLAN_ID == "" %}{{ bmh_nic_names[1] }}{% else %}{{ bmh_nic_names[0] }}.{{ EXTERNAL_VLAN_ID }}{% endif %}
6464
6565
virtual_router_id 1
6666
priority 101

tests/roles/run_tests/templates/release-1.9/cluster-template-controlplane-kubeadm-config-centos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ files:
6060
6161
vrrp_instance VI_1 {
6262
state MASTER
63-
interface {% if EXTERNAL_VLAN_ID == "" %}eth1{% else %}eth0.{{ EXTERNAL_VLAN_ID }}{% endif %}
63+
interface {% if EXTERNAL_VLAN_ID == "" %}{{ bmh_nic_names[1] }}{% else %}{{ bmh_nic_names[0] }}.{{ EXTERNAL_VLAN_ID }}{% endif %}
6464
6565
virtual_router_id 1
6666
priority 101

0 commit comments

Comments
 (0)