Skip to content

Commit a9203ec

Browse files
committed
[ci bootstrap] Do not add external gateway to router
For clouds where instances directly attached to public network, having a router with default gateway is unnecessary as secondary network is mostly used for internal traffic. This will save some external IPs i.e 1 per job. This needs to be set only when the test vm needs to have external connectivity which is not needed in most cases. Depends-On: https://review.rdoproject.org/r/c/config/+/57579 Related-Issue: OSPCIX-771
1 parent ededd71 commit a9203ec

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

zuul.d/adoption.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
networks:
4848
default:
4949
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
50-
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
50+
router_net: ""
5151
range: 192.168.122.0/24
5252
internal-api:
5353
vlan: 20
@@ -221,7 +221,7 @@
221221
networks: &multinode_networks
222222
default:
223223
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
224-
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
224+
router_net: ""
225225
range: 192.168.122.0/24
226226
internal-api:
227227
vlan: 20

zuul.d/base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
networks:
166166
default:
167167
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
168-
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
168+
router_net: ""
169169
range: 192.168.122.0/24
170170
internal-api:
171171
vlan: 20

zuul.d/edpm_multinode.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
networks:
1313
default:
1414
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
15-
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
15+
router_net: ""
1616
range: 192.168.122.0/24
1717
internal-api:
1818
vlan: 20
@@ -75,7 +75,7 @@
7575
networks:
7676
default:
7777
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
78-
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
78+
router_net: ""
7979
range: 192.168.122.0/24
8080
internal-api:
8181
vlan: 20
@@ -152,7 +152,7 @@
152152
networks:
153153
default:
154154
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
155-
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
155+
router_net: ""
156156
range: 192.168.122.0/24
157157
internal-api:
158158
vlan: 20
@@ -244,7 +244,7 @@
244244
networks:
245245
default:
246246
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
247-
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
247+
router_net: ""
248248
range: 192.168.122.0/24
249249
internal-api:
250250
vlan: 20

zuul.d/kuttl_multinode.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
default:
1515
range: 192.168.122.0/24
1616
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
17-
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
17+
router_net: ""
1818
router: false
1919
internal-api:
2020
vlan: 20

zuul.d/podified_multinode.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
default:
2323
range: 192.168.122.0/24
2424
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
25-
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
25+
router_net: ""
2626
internal-api:
2727
vlan: 20
2828
range: 172.17.0.0/24

zuul.d/tempest_multinode.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
default:
2323
range: 192.168.122.0/24
2424
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
25-
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
25+
router_net: ""
2626
internal-api:
2727
vlan: 20
2828
range: 172.17.0.0/24

0 commit comments

Comments
 (0)