Skip to content

Commit 22d74e9

Browse files
eduolivareseduolivares
committed
[BGP] Fix EDPM hostnames
The ansibleVars values were not properly obtained by ci-fmw due to the wrong EDPM hostnames used. The right hostnames after OSPRH-13820 changes are: - edpm-r0-compute-0 (compute connected to rack0) - edpm-r1-compute-0 (compute connected to rack1) - edpm-r0-networker-0 (networker connected to rack0) ... Depends-On: openstack-k8s-operators/ci-framework#2762
1 parent 189477e commit 22d74e9

File tree

6 files changed

+28
-52
lines changed

6 files changed

+28
-52
lines changed

‎examples/dt/bgp_dt01/edpm/computes/r0/values.yaml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@ data:
3232
dnf -y install conntrack-tools
3333
edpm_network_config_hide_sensitive_logs: false
3434
edpm_network_config_os_net_config_mappings:
35-
edpm-compute-0:
35+
edpm-r0-compute-0:
3636
nic2: 6a:fe:54:3f:8a:02 # CHANGEME
37-
edpm-compute-1:
38-
nic2: 6b:fe:54:3f:8a:02 # CHANGEME
39-
edpm-compute-2:
40-
nic2: 6c:fe:54:3f:8a:02 # CHANGEME
4137
edpm_network_config_template: |
4238
---
4339
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,8 +118,8 @@ data:
122118
- name: BgpMainNetV6
123119
subnetName: subnet2
124120
nodes:
125-
edpm-compute-0:
126-
hostName: edpm-compute-0
121+
edpm-r0-compute-0:
122+
hostName: edpm-r0-compute-0
127123
ansible:
128124
ansibleHost: 192.168.122.100
129125
ansibleVars:

‎examples/dt/bgp_dt01/edpm/computes/r1/values.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@ data:
3232
dnf -y install conntrack-tools
3333
edpm_network_config_hide_sensitive_logs: false
3434
edpm_network_config_os_net_config_mappings:
35-
edpm-compute-0:
35+
edpm-r1-compute-0:
3636
nic2: 6a:fe:54:3f:8a:02 # CHANGEME
37-
edpm-compute-1:
38-
nic2: 6b:fe:54:3f:8a:02 # CHANGEME
39-
edpm-compute-2:
40-
nic2: 6c:fe:54:3f:8a:02 # CHANGEME
4137
edpm_network_config_template: |
4238
---
4339
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,10 +118,10 @@ data:
122118
- name: BgpMainNetV6
123119
subnetName: subnet2
124120
nodes:
125-
edpm-compute-1:
126-
hostName: edpm-compute-1
121+
edpm-r1-compute-0:
122+
hostName: edpm-r1-compute-0
127123
ansible:
128-
ansibleHost: 192.168.122.101
124+
ansibleHost: 192.168.123.100
129125
ansibleVars:
130126
edpm_ovn_bgp_agent_local_ovn_peer_ips:
131127
- 100.64.1.1
@@ -135,7 +131,7 @@ data:
135131
- 100.65.1.1
136132
networks:
137133
- defaultRoute: true
138-
fixedIP: 192.168.122.101
134+
fixedIP: 192.168.123.100
139135
name: CtlPlane
140136
subnetName: subnet1
141137
- name: InternalApi

‎examples/dt/bgp_dt01/edpm/computes/r2/values.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@ data:
3232
dnf -y install conntrack-tools
3333
edpm_network_config_hide_sensitive_logs: false
3434
edpm_network_config_os_net_config_mappings:
35-
edpm-compute-0:
35+
edpm-r2-compute-0:
3636
nic2: 6a:fe:54:3f:8a:02 # CHANGEME
37-
edpm-compute-1:
38-
nic2: 6b:fe:54:3f:8a:02 # CHANGEME
39-
edpm-compute-2:
40-
nic2: 6c:fe:54:3f:8a:02 # CHANGEME
4137
edpm_network_config_template: |
4238
---
4339
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,10 +118,10 @@ data:
122118
- name: BgpMainNetV6
123119
subnetName: subnet2
124120
nodes:
125-
edpm-compute-2:
126-
hostName: edpm-compute-2
121+
edpm-r2-compute-0:
122+
hostName: edpm-r2-compute-0
127123
ansible:
128-
ansibleHost: 192.168.122.102
124+
ansibleHost: 192.168.124.100
129125
ansibleVars:
130126
edpm_ovn_bgp_agent_local_ovn_peer_ips:
131127
- 100.64.2.1
@@ -135,7 +131,7 @@ data:
135131
- 100.65.2.1
136132
networks:
137133
- defaultRoute: true
138-
fixedIP: 192.168.122.102
134+
fixedIP: 192.168.124.100
139135
name: CtlPlane
140136
subnetName: subnet1
141137
- name: InternalApi

‎examples/dt/bgp_dt01/edpm/networkers/r0/values.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@ data:
3232
dnf -y install conntrack-tools
3333
edpm_network_config_hide_sensitive_logs: false
3434
edpm_network_config_os_net_config_mappings:
35-
edpm-networker-0:
35+
edpm-r0-networker-0:
3636
nic2: 6d:fe:54:3f:8a:02 # CHANGEME
37-
edpm-networker-1:
38-
nic2: 6e:fe:54:3f:8a:02 # CHANGEME
39-
edpm-networker-2:
40-
nic2: 6f:fe:54:3f:8a:02 # CHANGEME
4137
edpm_network_config_template: |
4238
---
4339
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,10 +118,10 @@ data:
122118
- name: BgpMainNetV6
123119
subnetName: subnet2
124120
nodes:
125-
edpm-networker-0:
126-
hostName: edpm-networker-0
121+
edpm-r0-networker-0:
122+
hostName: edpm-r0-networker-0
127123
ansible:
128-
ansibleHost: 192.168.122.105
124+
ansibleHost: 192.168.122.200
129125
ansibleVars:
130126
edpm_ovn_bgp_agent_local_ovn_peer_ips:
131127
- 100.64.0.5
@@ -135,7 +131,7 @@ data:
135131
- 100.65.0.5
136132
networks:
137133
- defaultRoute: true
138-
fixedIP: 192.168.122.105
134+
fixedIP: 192.168.122.200
139135
name: CtlPlane
140136
subnetName: subnet1
141137
- name: InternalApi

‎examples/dt/bgp_dt01/edpm/networkers/r1/values.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@ data:
3232
dnf -y install conntrack-tools
3333
edpm_network_config_hide_sensitive_logs: false
3434
edpm_network_config_os_net_config_mappings:
35-
edpm-networker-0:
35+
edpm-r1-networker-0:
3636
nic2: 6d:fe:54:3f:8a:02 # CHANGEME
37-
edpm-networker-1:
38-
nic2: 6e:fe:54:3f:8a:02 # CHANGEME
39-
edpm-networker-2:
40-
nic2: 6f:fe:54:3f:8a:02 # CHANGEME
4137
edpm_network_config_template: |
4238
---
4339
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,10 +118,10 @@ data:
122118
- name: BgpMainNetV6
123119
subnetName: subnet2
124120
nodes:
125-
edpm-networker-1:
126-
hostName: edpm-networker-1
121+
edpm-r1-networker-0:
122+
hostName: edpm-r1-networker-0
127123
ansible:
128-
ansibleHost: 192.168.122.106
124+
ansibleHost: 192.168.123.200
129125
ansibleVars:
130126
edpm_ovn_bgp_agent_local_ovn_peer_ips:
131127
- 100.64.1.5
@@ -135,7 +131,7 @@ data:
135131
- 100.65.1.5
136132
networks:
137133
- defaultRoute: true
138-
fixedIP: 192.168.122.106
134+
fixedIP: 192.168.123.200
139135
name: CtlPlane
140136
subnetName: subnet1
141137
- name: InternalApi

‎examples/dt/bgp_dt01/edpm/networkers/r2/values.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@ data:
3232
dnf -y install conntrack-tools
3333
edpm_network_config_hide_sensitive_logs: false
3434
edpm_network_config_os_net_config_mappings:
35-
edpm-networker-0:
35+
edpm-r2-networker-0:
3636
nic2: 6d:fe:54:3f:8a:02 # CHANGEME
37-
edpm-networker-1:
38-
nic2: 6e:fe:54:3f:8a:02 # CHANGEME
39-
edpm-networker-2:
40-
nic2: 6f:fe:54:3f:8a:02 # CHANGEME
4137
edpm_network_config_template: |
4238
---
4339
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,10 +118,10 @@ data:
122118
- name: BgpMainNetV6
123119
subnetName: subnet2
124120
nodes:
125-
edpm-networker-2:
126-
hostName: edpm-networker-2
121+
edpm-r2-networker-0:
122+
hostName: edpm-r2-networker-0
127123
ansible:
128-
ansibleHost: 192.168.122.107
124+
ansibleHost: 192.168.124.200
129125
ansibleVars:
130126
edpm_ovn_bgp_agent_local_ovn_peer_ips:
131127
- 100.64.2.5
@@ -135,7 +131,7 @@ data:
135131
- 100.65.2.5
136132
networks:
137133
- defaultRoute: true
138-
fixedIP: 192.168.122.107
134+
fixedIP: 192.168.124.200
139135
name: CtlPlane
140136
subnetName: subnet1
141137
- name: InternalApi

0 commit comments

Comments
 (0)