Skip to content

Commit 2f8a43b

Browse files
softwarefactory-project-zuul[bot]softwarefactory-project-zuul[bot]
authored
Merge pull request #512 from eduolivares/fix-bgp-edpm-ansiblevars
[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 Reviewed-by: Andrew Bays <[email protected]>
2 parents 189477e + c3b4c5e commit 2f8a43b

File tree

6 files changed

+34
-52
lines changed

6 files changed

+34
-52
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,16 @@ data:
2525
edpm_frr_bgp_ipv4_src_network: bgpmainnet
2626
edpm_frr_bgp_ipv6_src_network: bgpmainnetv6
2727
edpm_frr_bgp_neighbor_password: f00barZ
28+
edpm_frr_bfd: false
2829
timesync_ntp_servers:
2930
- hostname: pool.ntp.org
3031
# conntrack is necessary for some tobiko tests
3132
edpm_bootstrap_command: |
3233
dnf -y install conntrack-tools
3334
edpm_network_config_hide_sensitive_logs: false
3435
edpm_network_config_os_net_config_mappings:
35-
edpm-compute-0:
36+
edpm-r0-compute-0:
3637
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
4138
edpm_network_config_template: |
4239
---
4340
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,8 +119,8 @@ data:
122119
- name: BgpMainNetV6
123120
subnetName: subnet2
124121
nodes:
125-
edpm-compute-0:
126-
hostName: edpm-compute-0
122+
edpm-r0-compute-0:
123+
hostName: edpm-r0-compute-0
127124
ansible:
128125
ansibleHost: 192.168.122.100
129126
ansibleVars:

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,16 @@ data:
2525
edpm_frr_bgp_ipv4_src_network: bgpmainnet
2626
edpm_frr_bgp_ipv6_src_network: bgpmainnetv6
2727
edpm_frr_bgp_neighbor_password: f00barZ
28+
edpm_frr_bfd: false
2829
timesync_ntp_servers:
2930
- hostname: pool.ntp.org
3031
# conntrack is necessary for some tobiko tests
3132
edpm_bootstrap_command: |
3233
dnf -y install conntrack-tools
3334
edpm_network_config_hide_sensitive_logs: false
3435
edpm_network_config_os_net_config_mappings:
35-
edpm-compute-0:
36+
edpm-r1-compute-0:
3637
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
4138
edpm_network_config_template: |
4239
---
4340
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,10 +119,10 @@ data:
122119
- name: BgpMainNetV6
123120
subnetName: subnet2
124121
nodes:
125-
edpm-compute-1:
126-
hostName: edpm-compute-1
122+
edpm-r1-compute-0:
123+
hostName: edpm-r1-compute-0
127124
ansible:
128-
ansibleHost: 192.168.122.101
125+
ansibleHost: 192.168.123.100
129126
ansibleVars:
130127
edpm_ovn_bgp_agent_local_ovn_peer_ips:
131128
- 100.64.1.1
@@ -135,7 +132,7 @@ data:
135132
- 100.65.1.1
136133
networks:
137134
- defaultRoute: true
138-
fixedIP: 192.168.122.101
135+
fixedIP: 192.168.123.100
139136
name: CtlPlane
140137
subnetName: subnet1
141138
- name: InternalApi

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,16 @@ data:
2525
edpm_frr_bgp_ipv4_src_network: bgpmainnet
2626
edpm_frr_bgp_ipv6_src_network: bgpmainnetv6
2727
edpm_frr_bgp_neighbor_password: f00barZ
28+
edpm_frr_bfd: false
2829
timesync_ntp_servers:
2930
- hostname: pool.ntp.org
3031
# conntrack is necessary for some tobiko tests
3132
edpm_bootstrap_command: |
3233
dnf -y install conntrack-tools
3334
edpm_network_config_hide_sensitive_logs: false
3435
edpm_network_config_os_net_config_mappings:
35-
edpm-compute-0:
36+
edpm-r2-compute-0:
3637
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
4138
edpm_network_config_template: |
4239
---
4340
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,10 +119,10 @@ data:
122119
- name: BgpMainNetV6
123120
subnetName: subnet2
124121
nodes:
125-
edpm-compute-2:
126-
hostName: edpm-compute-2
122+
edpm-r2-compute-0:
123+
hostName: edpm-r2-compute-0
127124
ansible:
128-
ansibleHost: 192.168.122.102
125+
ansibleHost: 192.168.124.100
129126
ansibleVars:
130127
edpm_ovn_bgp_agent_local_ovn_peer_ips:
131128
- 100.64.2.1
@@ -135,7 +132,7 @@ data:
135132
- 100.65.2.1
136133
networks:
137134
- defaultRoute: true
138-
fixedIP: 192.168.122.102
135+
fixedIP: 192.168.124.100
139136
name: CtlPlane
140137
subnetName: subnet1
141138
- name: InternalApi

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,16 @@ data:
2525
edpm_frr_bgp_ipv4_src_network: bgpmainnet
2626
edpm_frr_bgp_ipv6_src_network: bgpmainnetv6
2727
edpm_frr_bgp_neighbor_password: f00barZ
28+
edpm_frr_bfd: false
2829
timesync_ntp_servers:
2930
- hostname: pool.ntp.org
3031
# conntrack is necessary for some tobiko tests
3132
edpm_bootstrap_command: |
3233
dnf -y install conntrack-tools
3334
edpm_network_config_hide_sensitive_logs: false
3435
edpm_network_config_os_net_config_mappings:
35-
edpm-networker-0:
36+
edpm-r0-networker-0:
3637
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
4138
edpm_network_config_template: |
4239
---
4340
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,10 +119,10 @@ data:
122119
- name: BgpMainNetV6
123120
subnetName: subnet2
124121
nodes:
125-
edpm-networker-0:
126-
hostName: edpm-networker-0
122+
edpm-r0-networker-0:
123+
hostName: edpm-r0-networker-0
127124
ansible:
128-
ansibleHost: 192.168.122.105
125+
ansibleHost: 192.168.122.200
129126
ansibleVars:
130127
edpm_ovn_bgp_agent_local_ovn_peer_ips:
131128
- 100.64.0.5
@@ -135,7 +132,7 @@ data:
135132
- 100.65.0.5
136133
networks:
137134
- defaultRoute: true
138-
fixedIP: 192.168.122.105
135+
fixedIP: 192.168.122.200
139136
name: CtlPlane
140137
subnetName: subnet1
141138
- name: InternalApi

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,16 @@ data:
2525
edpm_frr_bgp_ipv4_src_network: bgpmainnet
2626
edpm_frr_bgp_ipv6_src_network: bgpmainnetv6
2727
edpm_frr_bgp_neighbor_password: f00barZ
28+
edpm_frr_bfd: false
2829
timesync_ntp_servers:
2930
- hostname: pool.ntp.org
3031
# conntrack is necessary for some tobiko tests
3132
edpm_bootstrap_command: |
3233
dnf -y install conntrack-tools
3334
edpm_network_config_hide_sensitive_logs: false
3435
edpm_network_config_os_net_config_mappings:
35-
edpm-networker-0:
36+
edpm-r1-networker-0:
3637
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
4138
edpm_network_config_template: |
4239
---
4340
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,10 +119,10 @@ data:
122119
- name: BgpMainNetV6
123120
subnetName: subnet2
124121
nodes:
125-
edpm-networker-1:
126-
hostName: edpm-networker-1
122+
edpm-r1-networker-0:
123+
hostName: edpm-r1-networker-0
127124
ansible:
128-
ansibleHost: 192.168.122.106
125+
ansibleHost: 192.168.123.200
129126
ansibleVars:
130127
edpm_ovn_bgp_agent_local_ovn_peer_ips:
131128
- 100.64.1.5
@@ -135,7 +132,7 @@ data:
135132
- 100.65.1.5
136133
networks:
137134
- defaultRoute: true
138-
fixedIP: 192.168.122.106
135+
fixedIP: 192.168.123.200
139136
name: CtlPlane
140137
subnetName: subnet1
141138
- name: InternalApi

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,16 @@ data:
2525
edpm_frr_bgp_ipv4_src_network: bgpmainnet
2626
edpm_frr_bgp_ipv6_src_network: bgpmainnetv6
2727
edpm_frr_bgp_neighbor_password: f00barZ
28+
edpm_frr_bfd: false
2829
timesync_ntp_servers:
2930
- hostname: pool.ntp.org
3031
# conntrack is necessary for some tobiko tests
3132
edpm_bootstrap_command: |
3233
dnf -y install conntrack-tools
3334
edpm_network_config_hide_sensitive_logs: false
3435
edpm_network_config_os_net_config_mappings:
35-
edpm-networker-0:
36+
edpm-r2-networker-0:
3637
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
4138
edpm_network_config_template: |
4239
---
4340
{% set mtu_list = [ctlplane_mtu] %}
@@ -122,10 +119,10 @@ data:
122119
- name: BgpMainNetV6
123120
subnetName: subnet2
124121
nodes:
125-
edpm-networker-2:
126-
hostName: edpm-networker-2
122+
edpm-r2-networker-0:
123+
hostName: edpm-r2-networker-0
127124
ansible:
128-
ansibleHost: 192.168.122.107
125+
ansibleHost: 192.168.124.200
129126
ansibleVars:
130127
edpm_ovn_bgp_agent_local_ovn_peer_ips:
131128
- 100.64.2.5
@@ -135,7 +132,7 @@ data:
135132
- 100.65.2.5
136133
networks:
137134
- defaultRoute: true
138-
fixedIP: 192.168.122.107
135+
fixedIP: 192.168.124.200
139136
name: CtlPlane
140137
subnetName: subnet1
141138
- name: InternalApi

0 commit comments

Comments
 (0)