Skip to content

Commit 3b5f70d

Browse files
averdaguaverdagu
committed
Adding support for adoption scenario 1
Dataplane adoption docs supports doing the adoption while wallaby environment uses different subnets than next generation. This commit enables Makefiles in order to prepare the environment with different subnets between environments. Related: OSPRH-5881
1 parent eb679bc commit 3b5f70d

File tree

10 files changed

+367
-112
lines changed

10 files changed

+367
-112
lines changed

‎Makefile‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ CLEANUP_DIR_CMD ?= rm -Rf
4444
# be also cloned from OPENSTACK_REPO/OPENSTACK_BRANCH.
4545
CHECKOUT_FROM_OPENSTACK_REF ?= false
4646

47+
NETWORK_INTERNALAPI_ADDRESS_PREFIX ?= 172.17.0
48+
NETWORK_STORAGE_ADDRESS_PREFIX ?= 172.18.0
49+
NETWORK_TENANT_ADDRESS_PREFIX ?= 172.19.0
50+
NETWORK_STORAGEMGMT_ADDRESS_PREFIX ?= 172.20.0
51+
NETWORK_DESIGNATE_ADDRESS_PREFIX ?= 172.28.0
52+
INTERNALAPI_HOST_ROUTES ?=
53+
STORAGE_HOST_ROUTES ?=
54+
TENANT_HOST_ROUTES ?=
55+
STORAGEMGMT_HOST_ROUTES ?=
56+
4757
# network isolation
4858
NETWORK_ISOLATION ?= true
4959
NETWORK_ISOLATION_USE_DEFAULT_NETWORK ?= true
@@ -2260,6 +2270,15 @@ nncp_with_retries: ## Deploy NNCP with retries
22602270
.PHONY: nncp
22612271
nncp: export INTERFACE=${NNCP_INTERFACE}
22622272
nncp: export BRIDGE_NAME=${NNCP_BRIDGE}
2273+
nncp: export INTERNALAPI_PREFIX=${NETWORK_INTERNALAPI_ADDRESS_PREFIX}
2274+
nncp: export NNCP_INTERNALAPI_HOST_ROUTES=${INTERNALAPI_HOST_ROUTES}
2275+
nncp: export STORAGE_PREFIX=${NETWORK_STORAGE_ADDRESS_PREFIX}
2276+
nncp: export NNCP_STORAGE_HOST_ROUTES=${STORAGE_HOST_ROUTES}
2277+
nncp: export STORAGEMGMT_PREFIX=${NETWORK_STORAGEMGMT_ADDRESS_PREFIX}
2278+
nncp: export NNCP_STORAGEMGMT_HOST_ROUTES=${STORAGEMGMT_HOST_ROUTES}
2279+
nncp: export TENANT_PREFIX=${NETWORK_TENANT_ADDRESS_PREFIX}
2280+
nncp: export NNCP_TENANT_HOST_ROUTES=${TENANT_HOST_ROUTES}
2281+
nncp: export DESIGNATE_PREFIX=${NETWORK_DESIGNATE_ADDRESS_PREFIX}
22632282
ifeq ($(NETWORK_BGP), true)
22642283
nncp: export BGP=enabled
22652284
nncp: export INTERFACE_BGP_1=${NNCP_BGP_1_INTERFACE}
@@ -2325,6 +2344,11 @@ netattach: export IPV6_ENABLED=true
23252344
netattach: export CTLPLANE_IPV6_ADDRESS_PREFIX=${NNCP_CTLPLANE_IPV6_ADDRESS_PREFIX}
23262345
netattach: export CTLPLANE_IPV6_ADDRESS_SUFFIX=${NNCP_CTLPLANE_IPV6_ADDRESS_SUFFIX}
23272346
endif
2347+
netattach: export INTERNALAPI_PREFIX=${NETWORK_INTERNALAPI_ADDRESS_PREFIX}
2348+
netattach: export STORAGE_PREFIX=${NETWORK_STORAGE_ADDRESS_PREFIX}
2349+
netattach: export STORAGEMGMT_PREFIX=${NETWORK_STORAGEMGMT_ADDRESS_PREFIX}
2350+
netattach: export TENANT_PREFIX=${NETWORK_TENANT_ADDRESS_PREFIX}
2351+
netattach: export DESIGNATE_PREFIX=${NETWORK_DESIGNATE_ADDRESS_PREFIX}
23282352
netattach: export VLAN_START=${NETWORK_VLAN_START}
23292353
netattach: export VLAN_STEP=${NETWORK_VLAN_STEP}
23302354
netattach: export CTLPLANE_IP_ADDRESS_PREFIX=${NNCP_CTLPLANE_IP_ADDRESS_PREFIX}
@@ -2374,6 +2398,11 @@ endif
23742398
metallb_config: export NAMESPACE=metallb-system
23752399
metallb_config: export CTLPLANE_METALLB_POOL=${METALLB_POOL}
23762400
metallb_config: export CTLPLANE_METALLB_IPV6_POOL=${METALLB_IPV6_POOL}
2401+
metallb_config: export INTERNALAPI_PREFIX=${NETWORK_INTERNALAPI_ADDRESS_PREFIX}
2402+
metallb_config: export STORAGE_PREFIX=${NETWORK_STORAGE_ADDRESS_PREFIX}
2403+
metallb_config: export STORAGEMGMT_PREFIX=${NETWORK_STORAGEMGMT_ADDRESS_PREFIX}
2404+
metallb_config: export TENANT_PREFIX=${NETWORK_TENANT_ADDRESS_PREFIX}
2405+
metallb_config: export DESIGNATE_PREFIX=${NETWORK_DESIGNATE_ADDRESS_PREFIX}
23772406
ifeq ($(NETWORK_ISOLATION_IPV4), true)
23782407
metallb_config: export IPV4_ENABLED=true
23792408
endif

‎devsetup/Makefile‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ CRC_HTTPS_PROXY ?=
1111
OCP_NETWORK_NAME ?=crc
1212
NETWORK_ISOLATION_USE_DEFAULT_NETWORK ?= true
1313

14+
ADOPTED_INTERNALAPI_NETWORK ?= 172.17.1.0/24
15+
ADOPTED_STORAGE_NETWORK ?= 172.18.1.0/24
16+
ADOPTED_EXTERNAL_NETWORK ?= 172.21.1.0/24
17+
ADOPTED_STORAGEMGMT_NETWORK ?= 172.20.1.0/24
18+
ADOPTED_TENANT_NETWORK ?= 172.9.1.0/24
19+
STANDALONE_INTERNALAPI_NET_PREFIX ?= 172.17.0
20+
STANDALONE_STORAGE_NET_PREFIX ?= 172.18.0
21+
STANDALONE_EXTERNAL_NET_PREFFIX ?= 172.21.0
22+
STANDALONE_STORAGEMGMT_NET_PREFIX ?= 172.20.0
23+
STANDALONE_TENANT_NET_PREFIX ?= 172.19.0
24+
1425
NETWORK_ISOLATION_MAC ?= 52:54:00:11:11:10
1526
ifeq ($(NETWORK_ISOLATION_USE_DEFAULT_NETWORK), true)
1627
NETWORK_ISOLATION_NET_NAME ?= default
@@ -486,6 +497,16 @@ tripleo_deploy: export COMPUTE_CEPH_NOVA=${EDPM_COMPUTE_CEPH_NOVA}
486497
tripleo_deploy: export TRIPLEO_NETWORKING=${EDPM_CONFIGURE_NETWORKING}
487498
tripleo_deploy: export TRIPLEO_ATTACH_EXTNET=${EDPM_ATTACH_EXTNET}
488499
tripleo_deploy: export TRIPLEO_CONFIGURE_DEFAULT_ROUTE=${EDPM_CONFIGURE_DEFAULT_ROUTE}
500+
tripleo_deploy: export NETWORK_INTERNAL_PREFIX = ${STANDALONE_INTERNALAPI_NET_PREFIX}
501+
tripleo_deploy: export NETWORK_STORAGE_PREFIX = ${STANDALONE_STORAGE_NET_PREFIX}
502+
tripleo_deploy: export NETWORK_STORAGE_MGMT_PREFIX = ${STANDALONE_STORAGEMGMT_NET_PREFIX}
503+
tripleo_deploy: export NETWORK_TENANT_PREFIX = ${STANDALONE_TENANT_NET_PREFIX}
504+
tripleo_deploy: export NETWORK_EXTERNAL_PREFFIX = ${STANDALONE_EXTERNAL_NET_PREFFIX}
505+
tripleo_deploy: export ADOPTED_INTERNAL_NET = ${ADOPTED_INTERNALAPI_NETWORK}
506+
tripleo_deploy: export ADOPTED_STORAGE_NET = ${ADOPTED_STORAGE_NETWORK}
507+
tripleo_deploy: export ADOPTED_STORAGE_MGMT_NET = ${ADOPTED_STORAGEMGMT_NETWORK}
508+
tripleo_deploy: export ADOPTED_TENANT_NET = ${ADOPTED_TENANT_NETWORK}
509+
tripleo_deploy: export ADOPTED_EXTERNAL_NET = ${ADOPTED_EXTERNAL_NETWORK}
489510
tripleo_deploy:
490511
$(eval $(call vars))
491512
scripts/tripleo.sh
@@ -504,6 +525,16 @@ standalone_deploy: export COMPUTE_DHCP_AGENT_ENABLED=${EDPM_COMPUTE_DHCP_AGENT_E
504525
standalone_deploy: export STANDALONE=true
505526
standalone_deploy: export INTERFACE_MTU=${NETWORK_MTU}
506527
standalone_deploy: export EDPM_COMPUTE_NETWORK = ${NETWORK_ISOLATION_NET_NAME}
528+
standalone_deploy: export NETWORK_INTERNAL_PREFIX = ${STANDALONE_INTERNALAPI_NET_PREFIX}
529+
standalone_deploy: export NETWORK_STORAGE_PREFIX = ${STANDALONE_STORAGE_NET_PREFIX}
530+
standalone_deploy: export NETWORK_STORAGE_MGMT_PREFIX = ${STANDALONE_STORAGEMGMT_NET_PREFIX}
531+
standalone_deploy: export NETWORK_TENANT_PREFIX = ${STANDALONE_TENANT_NET_PREFIX}
532+
standalone_deploy: export NETWORK_EXTERNAL_PREFFIX = ${STANDALONE_EXTERNAL_NET_PREFFIX}
533+
standalone_deploy: export ADOPTED_INTERNAL_NET = ${ADOPTED_INTERNALAPI_NETWORK}
534+
standalone_deploy: export ADOPTED_STORAGE_NET = ${ADOPTED_STORAGE_NETWORK}
535+
standalone_deploy: export ADOPTED_STORAGE_MGMT_NET = ${ADOPTED_STORAGEMGMT_NETWORK}
536+
standalone_deploy: export ADOPTED_TENANT_NET = ${ADOPTED_TENANT_NETWORK}
537+
standalone_deploy: export ADOPTED_EXTERNAL_NET = ${ADOPTED_EXTERNAL_NETWORK}
507538
standalone_deploy:
508539
$(eval $(call vars))
509540
scripts/standalone.sh ${EDPM_COMPUTE_SUFFIX} ${STANDALONE_COMPUTE_DRIVER} '${EDPM_COMPUTE_ADDITIONAL_NETWORKS}' '${EDPM_COMPUTE_ADDITIONAL_HOST_ROUTES}'

‎devsetup/scripts/standalone.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,15 @@ dns_server: ${PRIMARY_RESOLV_CONF_ENTRY}
218218
compute_driver: ${COMPUTE_DRIVER}
219219
sriov_agent: ${EDPM_COMPUTE_SRIOV_ENABLED}
220220
dhcp_agent: ${EDPM_COMPUTE_DHCP_AGENT_ENABLED}
221+
# Adoption related stuff
222+
adopted_internal_net: ${ADOPTED_INTERNAL_NET}
223+
adopted_storage_net: ${ADOPTED_STORAGE_NET}
224+
adopted_storage_mgmt_net: ${ADOPTED_STORAGE_MGMT_NET}
225+
adopted_tenant_net: ${ADOPTED_TENANT_NET}
226+
standalone_internal_prefix: ${NETWORK_INTERNAL_PREFIX}
227+
standalone_storage_prefix: ${NETWORK_STORAGE_PREFIX}
228+
standalone_storage_mgmt_prefix: ${NETWORK_STORAGE_MGMT_PREFIX}
229+
standalone_tenant_prefix: ${NETWORK_TENANT_PREFIX}
221230
EOF
222231

223232
jinja2_render standalone/network_data.j2 "${J2_VARS_FILE}" > ${MY_TMP_DIR}/network_data.yaml

‎devsetup/scripts/tripleo.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,17 @@ tripleo_networking: ${TRIPLEO_NETWORKING}
174174
dns_server: ${PRIMARY_RESOLV_CONF_ENTRY}
175175
user_home: /home/zuul
176176
cloud_domain: ${CLOUD_DOMAIN}
177+
# Adoption related stuff
178+
adopted_internal_net: ${ADOPTED_INTERNAL_NET}
179+
adopted_storage_net: ${ADOPTED_STORAGE_NET}
180+
adopted_storage_mgmt_net: ${ADOPTED_STORAGE_MGMT_NET}
181+
adopted_tenant_net: ${ADOPTED_TENANT_NET}
182+
adopted_external_net: ${ADOPTED_EXTERNAL_NET}
183+
standalone_internal_prefix: ${NETWORK_INTERNAL_PREFIX}
184+
standalone_storage_prefix: ${NETWORK_STORAGE_PREFIX}
185+
standalone_storage_mgmt_prefix: ${NETWORK_STORAGE_MGMT_PREFIX}
186+
standalone_tenant_prefix: ${NETWORK_TENANT_PREFIX}
187+
standalone_external_prefix: ${NETWORK_EXTERNAL_PREFIX}
177188
EOF
178189

179190
jinja2_render ${SCRIPTPATH}/../tripleo/undercloud.conf.j2 "${J2_VARS_FILE}" > ${MY_TMP_DIR}/undercloud.conf

‎devsetup/standalone/net_config.j2‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,56 @@ network_config:
4242
mtu: {{ interface_mtu }}
4343
vlan_id: 20
4444
addresses:
45-
- ip_netmask: 172.17.0.{{ ip_address_suffix }}/24
46-
- ip_netmask: 172.17.0.2/32
45+
- ip_netmask: {{ standalone_internal_prefix | default("172.17.0", true) }}.{{ ip_address_suffix }}/24
46+
- ip_netmask: {{ standalone_internal_prefix | default("172.17.0", true) }}.2/32
47+
{% if adopted_internal_net|default %}
48+
routes:
49+
- ip_netmask: {{ adopted_internal_net }}
50+
next_hop: {{ standalone_internal_prefix | default("172.17.0", true) }}.{{ ip_address_suffix }}
51+
{% else %}
4752
routes: []
53+
{% endif %}
4854
# storage
4955
- type: vlan
5056
mtu: {{ interface_mtu }}
5157
vlan_id: 21
5258
addresses:
53-
- ip_netmask: 172.18.0.{{ ip_address_suffix }}/24
54-
- ip_netmask: 172.18.0.2/32
59+
- ip_netmask: {{ standalone_storage_prefix | default("172.18.0", true) }}.{{ ip_address_suffix }}/24
60+
- ip_netmask: {{ standalone_storage_prefix | default("172.18.0", true) }}.2/32
61+
{% if adopted_storage_net|default %}
62+
routes:
63+
- ip_netmask: {{ adopted_storage_net }}
64+
next_hop: {{ standalone_storage_prefix | default("172.18.0", true) }}.{{ ip_address_suffix }}
65+
{% else %}
5566
routes: []
67+
{% endif %}
5668
# storage_mgmt
5769
- type: vlan
5870
mtu: {{ interface_mtu }}
5971
vlan_id: 23
6072
addresses:
61-
- ip_netmask: 172.20.0.{{ ip_address_suffix }}/24
62-
- ip_netmask: 172.20.0.2/32
73+
- ip_netmask: {{ standalone_storage_mgmt_prefix | default("172.20.0", true) }}.{{ ip_address_suffix }}/24
74+
- ip_netmask: {{ standalone_storage_mgmt_prefix | default("172.20.0", true) }}.2/32
75+
{% if adopted_storage_mgmt_net|default %}
76+
routes:
77+
- ip_netmask: {{ adopted_storage_mgmt_net }}
78+
next_hop: {{ standalone_storage_mgmt_prefix | default("172.20.0", true) }}.{{ ip_address_suffix }}
79+
{% else %}
6380
routes: []
81+
{% endif %}
6482
# tenant
6583
- type: vlan
6684
mtu: {{ interface_mtu }}
6785
vlan_id: 22
6886
addresses:
69-
- ip_netmask: 172.19.0.{{ ip_address_suffix }}/24
87+
- ip_netmask: {{ standalone_tenant_prefix | default("172.19.0", true) }}.{{ ip_address_suffix }}/24
88+
{% if adopted_tenant_net|default %}
89+
routes:
90+
- ip_netmask: {{ adopted_tenant_net }}
91+
next_hop: {{ standalone_tenant_prefix | default("172.19.0", true) }}.{{ ip_address_suffix }}
92+
{% else %}
7093
routes: []
94+
{% endif %}
7195
{%- for network in additional_networks if network.standalone_config %}
7296
{%- set net = network.standalone_config %}
7397
- type: {{ net.type }}

‎devsetup/tripleo/net_config.j2‎

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,37 +33,67 @@ network_config:
3333
mtu: {{ interface_mtu }}
3434
vlan_id: 44
3535
addresses:
36-
- ip_netmask: 172.21.0.{{ ip_address_suffix }}/24
37-
- ip_netmask: 172.21.0.2/32
36+
- ip_netmask: {{ standalone_external_prefix | default("172.21.0", true)}}.{{ ip_address_suffix }}/24
37+
- ip_netmask: {{ standalone_external_prefix | default("172.21.0", true)}}.2/32
38+
{% if adopted_external_net|default %}
39+
routes:
40+
- ip_netmask: {{ adopted_external_net }}
41+
next_hop: {{ standalone_external_prefix | default("172.21.0", true) }}.{{ip_address_suffix}}
42+
{% else %}
3843
routes: []
44+
{% endif %}
3945
# internal
4046
- type: vlan
4147
mtu: {{ interface_mtu }}
4248
vlan_id: 20
4349
addresses:
44-
- ip_netmask: 172.17.0.{{ ip_address_suffix }}/24
45-
- ip_netmask: 172.17.0.2/32
50+
- ip_netmask: {{ standalone_internal_prefix | default("172.17.0", true)}}.{{ ip_address_suffix }}/24
51+
- ip_netmask: {{ standalone_internal_prefix | default("172.17.0", true)}}.2/32
52+
{% if adopted_internal_net|default %}
53+
routes:
54+
- ip_netmask: {{ adopted_internal_net }}
55+
next_hop: {{ standalone_internal_prefix | default("172.17.0", true) }}.{{ip_address_suffix}}
56+
{% else %}
4657
routes: []
58+
{% endif %}
4759
# storage
4860
- type: vlan
4961
mtu: {{ interface_mtu }}
5062
vlan_id: 21
5163
addresses:
52-
- ip_netmask: 172.18.0.{{ ip_address_suffix }}/24
53-
- ip_netmask: 172.18.0.2/32
64+
- ip_netmask: {{ standalone_storage_prefix | default("172.18.0", true) }}.{{ ip_address_suffix }}/24
65+
- ip_netmask: {{ standalone_storage_prefix | default("172.18.0", true) }}.2/32
66+
{% if adopted_storage_net|default %}
67+
routes:
68+
- ip_netmask: {{ adopted_storage_net }}
69+
next_hop: {{ standalone_storage_prefix | default("172.18.0", true) }}.{{ ip_address_suffix }}
70+
{% else %}
5471
routes: []
72+
{% endif %}
5573
# storage_mgmt
5674
- type: vlan
5775
mtu: {{ interface_mtu }}
5876
vlan_id: 23
5977
addresses:
60-
- ip_netmask: 172.20.0.{{ ip_address_suffix }}/24
61-
- ip_netmask: 172.20.0.2/32
78+
- ip_netmask: {{ standalone_storage_mgmt_prefix | default("172.20.0", true) }}.{{ ip_address_suffix }}/24
79+
- ip_netmask: {{ standalone_storage_mgmt_prefix | default("172.20.0", true) }}.2/32
80+
{% if adopted_storage_mgmt_net|default %}
81+
routes:
82+
- ip_netmask: {{ adopted_storage_mgmt_net }}
83+
next_hop: {{ standalone_storage_mgmt_prefix | default("172.20.0", true) }}.{{ ip_address_suffix }}
84+
{% else %}
6285
routes: []
86+
{% endif %}
6387
# tenant
6488
- type: vlan
6589
mtu: {{ interface_mtu }}
6690
vlan_id: 22
6791
addresses:
68-
- ip_netmask: 172.19.0.{{ ip_address_suffix }}/24
92+
- ip_netmask: {{ standalone_tenant_prefix | default("172.19.0", true) }}.{{ ip_address_suffix }}/24
93+
{% if adopted_tenant_net|default %}
94+
routes:
95+
- ip_netmask: {{ adopted_tenant_net }}
96+
next_hop: {{ standalone_tenant_prefix | default("172.19.0", true) }}.{{ ip_address_suffix }}
97+
{% else %}
6998
routes: []
99+
{% endif %}

‎devsetup/tripleo/overcloud_net_config_scenario_a.j2‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
#jinja2: trim_blocks:False
2+
network_config:
3+
- type: ovs_bridge
4+
name: br-ex
5+
mtu: {{ interface_mtu }}
6+
use_dhcp: false
7+
dns_servers:
8+
{% if dns_server %}
9+
- {{ dns_server }}
10+
{% endif %}
11+
- {{ gateway_ip }}
12+
domain: []
13+
addresses:
14+
- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
15+
routes: []
16+
members:
17+
- type: interface
18+
name: {{ os_net_config_iface | default(nic1) }}
19+
mtu: {{ interface_mtu }}
20+
# force the MAC address of the bridge to this interface
21+
primary: true
22+
# external
23+
- type: vlan
24+
mtu: {{ interface_mtu }}
25+
vlan_id: 44
26+
addresses:
27+
- ip_netmask: {{ standalone_external_prefix | default("172.21.0", true)}}.{{ ip_address_suffix }}/24
28+
{% if adopted_external_net|default %}
29+
routes:
30+
- ip_netmask: {{ adopted_external_net }}
31+
next_hop: {{ standalone_external_prefix | default("172.21.0", true) }}.{{ip_address_suffix}}
32+
{% else %}
33+
routes: []
34+
{% endif %}
35+
# internal
36+
- type: vlan
37+
mtu: {{ interface_mtu }}
38+
vlan_id: 20
39+
addresses:
40+
- ip_netmask: {{ standalone_internal_prefix | default("172.17.0", true)}}.{{ ip_address_suffix }}/24
41+
{% if adopted_internal_net|default %}
42+
routes:
43+
- ip_netmask: {{ adopted_internal_net }}
44+
next_hop: {{ standalone_internal_prefix | default("172.17.0", true) }}.{{ip_address_suffix}}
45+
{% else %}
46+
routes: []
47+
{% endif %}
48+
# storage
49+
- type: vlan
50+
mtu: {{ interface_mtu }}
51+
vlan_id: 21
52+
addresses:
53+
- ip_netmask: {{ standalone_storage_prefix | default("172.18.0", true) }}.{{ ip_address_suffix }}/24
54+
{% if adopted_storage_net|default %}
55+
routes:
56+
- ip_netmask: {{ adopted_storage_net }}
57+
next_hop: {{ standalone_storage_prefix | default("172.18.0", true) }}.{{ ip_address_suffix }}
58+
{% else %}
59+
routes: []
60+
{% endif %}
61+
# storage_mgmt
62+
- type: vlan
63+
mtu: {{ interface_mtu }}
64+
vlan_id: 23
65+
addresses:
66+
- ip_netmask: {{ standalone_storage_mgmt_prefix | default("172.20.0", true) }}.{{ ip_address_suffix }}/24
67+
{% if adopted_storage_mgmt_net|default %}
68+
routes:
69+
- ip_netmask: {{ adopted_storage_mgmt_net }}
70+
next_hop: {{ standalone_storage_mgmt_prefix | default("172.20.0", true) }}.{{ ip_address_suffix }}
71+
{% else %}
72+
routes: []
73+
{% endif %}
74+
# tenant
75+
- type: vlan
76+
mtu: {{ interface_mtu }}
77+
vlan_id: 22
78+
addresses:
79+
- ip_netmask: {{ standalone_tenant_prefix | default("172.19.0", true) }}.{{ ip_address_suffix }}/24
80+
{% if adopted_tenant_net|default %}
81+
routes:
82+
- ip_netmask: {{ adopted_tenant_net }}
83+
next_hop: {{ standalone_tenant_prefix | default("172.19.0", true) }}.{{ ip_address_suffix }}
84+
{% else %}
85+
routes: []
86+
{% endif %}

‎scripts/gen-metallb-config.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ spec:
9292
EOF_CAT
9393
if [ -n "$IPV4_ENABLED" ]; then
9494
cat >> ${DEPLOY_DIR}/ipaddresspools.yaml <<EOF_CAT
95-
- 172.17.0.80-172.17.0.90
95+
- ${INTERNALAPI_PREFIX}.80-${INTERNALAPI_PREFIX}.90
9696
EOF_CAT
9797
fi
9898
if [ -n "$IPV6_ENABLED" ]; then
@@ -112,7 +112,7 @@ spec:
112112
EOF_CAT
113113
if [ -n "$IPV4_ENABLED" ]; then
114114
cat >> ${DEPLOY_DIR}/ipaddresspools.yaml <<EOF_CAT
115-
- 172.18.0.80-172.18.0.90
115+
- ${STORAGE_PREFIX}.80-${STORAGE_PREFIX}.90
116116
EOF_CAT
117117
fi
118118
if [ -n "$IPV6_ENABLED" ]; then
@@ -132,7 +132,7 @@ spec:
132132
EOF_CAT
133133
if [ -n "$IPV4_ENABLED" ]; then
134134
cat >> ${DEPLOY_DIR}/ipaddresspools.yaml <<EOF_CAT
135-
- 172.19.0.80-172.19.0.90
135+
- ${TENANT_PREFIX}.80-${TENANT_PREFIX}.90
136136
EOF_CAT
137137
fi
138138
if [ -n "$IPV6_ENABLED" ]; then

0 commit comments

Comments
 (0)