Skip to content

Commit 42e2dc4

Browse files
committed
Use transparent vlan in ci bootstrap
vexxhost and IBM cloud both have transparent vlan enabled now, so let's use it. This will avoid creation and deletion of all vlan and trunk ports. Also will avoid env breakage due to cleanup of ports for autohold nodes. Depends-On: https://review.rdoproject.org/r/c/config/+/57549 Depends-On: https://review.rdoproject.org/r/c/config/+/57614 Related-Issue: OSPCIX-771
1 parent 69aef1a commit 42e2dc4

6 files changed

Lines changed: 10 additions & 0 deletions

File tree

zuul.d/adoption.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
default:
4949
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
5050
router_net: ""
51+
transparent: true
5152
range: 192.168.122.0/24
5253
internal-api:
5354
vlan: 20
@@ -222,6 +223,7 @@
222223
default:
223224
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
224225
router_net: ""
226+
transparent: true
225227
range: 192.168.122.0/24
226228
internal-api:
227229
vlan: 20

zuul.d/base.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@
166166
default:
167167
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
168168
router_net: ""
169+
transparent: true
169170
range: 192.168.122.0/24
170171
internal-api:
171172
vlan: 20

zuul.d/edpm_multinode.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
default:
1414
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
1515
router_net: ""
16+
transparent: true
1617
range: 192.168.122.0/24
1718
internal-api:
1819
vlan: 20
@@ -76,6 +77,7 @@
7677
default:
7778
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
7879
router_net: ""
80+
transparent: true
7981
range: 192.168.122.0/24
8082
internal-api:
8183
vlan: 20
@@ -153,6 +155,7 @@
153155
default:
154156
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
155157
router_net: ""
158+
transparent: true
156159
range: 192.168.122.0/24
157160
internal-api:
158161
vlan: 20
@@ -245,6 +248,7 @@
245248
default:
246249
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
247250
router_net: ""
251+
transparent: true
248252
range: 192.168.122.0/24
249253
internal-api:
250254
vlan: 20

zuul.d/kuttl_multinode.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
range: 192.168.122.0/24
1616
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
1717
router_net: ""
18+
transparent: true
1819
router: false
1920
internal-api:
2021
vlan: 20

zuul.d/podified_multinode.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
range: 192.168.122.0/24
2424
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
2525
router_net: ""
26+
transparent: true
2627
internal-api:
2728
vlan: 20
2829
range: 172.17.0.0/24

zuul.d/tempest_multinode.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
range: 192.168.122.0/24
2424
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
2525
router_net: ""
26+
transparent: true
2627
internal-api:
2728
vlan: 20
2829
range: 172.17.0.0/24

0 commit comments

Comments
 (0)