diff --git a/Makefile b/Makefile index dc34640..bacceb3 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,48 @@ endif METADATA_SHARED_SECRET ?= 1234567842 HEAT_AUTH_ENCRYPTION_KEY ?= 767c3ed056cbaa3b9dfedb8c6f825bf0 +# POD networks +POD_INTERNALAPI_VLAN ?= 20 +POD_STORAGE_VLAN ?= 21 +POD_TENANT_VLAN ?= 22 +POD_INTERNALAPI_NET ?= 172.17.0 +POD_STORAGE_NET ?= 172.18.0 +POD_TENANT_NET ?= 172.19.0 +POD_INTERNALAPI_IP_START ?= 30 +POD_INTERNALAPI_IP_END ?= 70 +POD_STORAGE_IP_START ?= 30 +POD_STORAGE_IP_END ?= 70 +POD_TENANT_IP_START ?= 30 +POD_TENANT_IP_END ?= 70 +POD_METALLB_INTERNALAPI_IP_START ?= 80 +POD_METALLB_INTERNALAPI_IP_END ?= 90 +POD_METALLB_STORAGE_IP_START ?= 80 +POD_METALLB_STORAGE_IP_END ?= 90 +POD_METALLB_TENANT_IP_START ?= 80 +POD_METALLB_TENANT_IP_END ?= 90 + +# multiple controller deployment (MCD) +MCD_ENABLED ?= false +MCD_INTERNALAPI_VLAN ?= 20 +MCD_STORAGE_VLAN ?= 30 +MCD_TENANT_VLAN ?= 50 +MCD_INTERNALAPI_NET ?= 172.17.1 +MCD_STORAGE_NET ?= 172.17.3 +MCD_TENANT_NET ?= 172.17.2 +MCD_DATA_NET ?= 192.168.24 +MCD_INTERNALAPI_IP_START ?= 150 +MCD_INTERNALAPI_IP_END ?= 190 +MCD_STORAGE_IP_START ?= 150 +MCD_STORAGE_IP_END ?= 190 +MCD_TENANT_IP_START ?= 150 +MCD_TENANT_IP_END ?= 190 +MCD_METALLB_INTERNALAPI_IP_START ?= 191 +MCD_METALLB_INTERNALAPI_IP_END ?= 201 +MCD_METALLB_STORAGE_IP_START ?= 191 +MCD_METALLB_STORAGE_IP_END ?= 201 +MCD_METALLB_TENANT_IP_START ?= 191 +MCD_METALLB_TENANT_IP_END ?= 201 + # Allows overriding the cleanup command used in *_cleanup targets. # Useful in CI, to allow injectin kustomization in each operator CR directory # before the resource gets deployed. If it's not possible to inject Kustomizations/CRs @@ -327,7 +369,21 @@ MANILA_KUTTL_NAMESPACE ?= manila-kuttl-tests CEPH_IMG ?= quay.io/ceph/demo:latest-reef # NNCP -NNCP_INTERFACE ?= enp6s0 +## Interfaces +NNCP_INTERFACE ?= enp6s0 +NNCP_INTERFACE_DATA ?= $(if $(findstring true, $(MCD_ENABLED)),enp7s0,$(NNCP_INTERFACE)) +NNCP_INTERFACE_MANAGEMENT ?= $(if $(findstring true, $(MCD_ENABLED)),enp8s0,$(NNCP_INTERFACE)) +NNCP_INTERFACE_EXTERNAL ?= $(if $(findstring true, $(MCD_ENABLED)),enp9s0,$(NNCP_INTERFACE)) +## API +NNCP_INTERNALAPI_VLAN ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_INTERNALAPI_VLAN),$(POD_INTERNALAPI_VLAN)) +NNCP_STORAGE_VLAN ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_STORAGE_VLAN),$(POD_STORAGE_VLAN)) +NNCP_TENANT_VLAN ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_TENANT_VLAN),$(POD_TENANT_VLAN)) +## Networks +NNCP_INTERNALAPI_NET ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_INTERNALAPI_NET),$(POD_INTERNALAPI_NET)) +NNCP_STORAGE_NET ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_STORAGE_NET),$(POD_STORAGE_NET)) +NNCP_TENANT_NET ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_TENANT_NET),$(POD_TENANT_NET)) +NNCP_DATA_NET ?= $(MCD_DATA_NET) +## Others NNCP_TIMEOUT ?= 240s NNCP_CLEANUP_TIMEOUT ?= 120s NNCP_CTLPLANE_IP_ADDRESS_PREFIX ?=192.168.122 @@ -335,6 +391,22 @@ NNCP_CTLPLANE_IP_ADDRESS_SUFFIX ?=10 NNCP_GATEWAY ?=192.168.122.1 NNCP_DNS_SERVER ?=192.168.122.1 +# netattach +NETATTACH_INTERNALIP_IP_START ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_INTERNALAPI_IP_START),$(POD_INTERNALAPI_IP_START)) +NETATTACH_INTERNALIP_IP_END ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_INTERNALAPI_IP_END),$(POD_INTERNALAPI_IP_END)) +NETATTACH_STORAGE_IP_START ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_STORAGE_IP_START),$(POD_STORAGE_IP_START)) +NETATTACH_STORAGE_IP_END ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_STORAGE_IP_END),$(POD_STORAGE_IP_END)) +NETATTACH_TENANT_IP_START ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_TENANT_IP_START),$(POD_TENANT_IP_START)) +NETATTACH_TENANT_IP_END ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_TENANT_IP_END),$(POD_TENANT_IP_END)) + +# metallb +METALLB_INTERNALIP_IP_START ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_METALLB_INTERNALAPI_IP_START),$(POD_METALLB_INTERNALAPI_IP_START)) +METALLB_INTERNALIP_IP_END ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_METALLB_INTERNALAPI_IP_END),$(POD_METALLB_INTERNALAPI_IP_END)) +METALLB_STORAGE_IP_START ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_METALLB_STORAGE_IP_START),$(POD_METALLB_STORAGE_IP_START)) +METALLB_STORAGE_IP_END ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_METALLB_STORAGE_IP_END),$(POD_METALLB_STORAGE_IP_END)) +METALLB_STORAGE_IP_START ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_METALLB_TENANT_IP_START),$(POD_METALLB_TENANT_IP_START)) +METALLB_STORAGE_IP_END ?= $(if $(findstring true, $(MCD_ENABLED)),$(MCD_METALLB_TENANT_IP_END),$(POD_METALLB_TENANT_IP_END)) + # Telemetry TELEMETRY_IMG ?= quay.io/openstack-k8s-operators/telemetry-operator-index:latest TELEMETRY_REPO ?= https://github.com/openstack-k8s-operators/telemetry-operator.git @@ -1750,13 +1822,21 @@ nmstate: ## installs nmstate operator in the openshift-nmstate namespace .PHONY: nncp nncp: export INTERFACE=${NNCP_INTERFACE} +nncp: export INTERFACE_DATA=${NNCP_INTERFACE_DATA} +nncp: export INTERFACE_MANAGEMENT=${NNCP_INTERFACE_MANAGEMENT} +nncp: export INTERFACE_EXTERNAL=${NNCP_INTERFACE_EXTERNAL} +nncp: export INTERNALAPI_VLAN=${NNCP_INTERNALAPI_VLAN} +nncp: export STORAGE_VLAN=${NNCP_STORAGE_VLAN} +nncp: export TENANT_VLAN=${NNCP_TENANT_VLAN} +nncp: export INTERNALAPI_NET=${NNCP_INTERNALAPI_NET} +nncp: export STORAGE_NET=${NNCP_STORAGE_NET} +nncp: export TENANT_NET=${NNCP_TENANT_NET} +nncp: export DATA_NET=${NNCP_DATA_NET} nncp: export CTLPLANE_IP_ADDRESS_PREFIX=${NNCP_CTLPLANE_IP_ADDRESS_PREFIX} nncp: export CTLPLANE_IP_ADDRESS_SUFFIX=${NNCP_CTLPLANE_IP_ADDRESS_SUFFIX} nncp: export GATEWAY=${NNCP_GATEWAY} nncp: export DNS_SERVER=${NNCP_DNS_SERVER} nncp: export INTERFACE_MTU=${NETWORK_MTU} -nncp: export VLAN_START=${NETWORK_VLAN_START} -nncp: export VLAN_STEP=${NETWORK_VLAN_STEP} nncp: ## installs the nncp resources to configure the interface connected to the edpm node, right now only single nic vlan. Interface referenced via NNCP_INTERFACE $(eval $(call vars,$@,nncp)) WORKERS='$(shell oc get nodes -l node-role.kubernetes.io/worker -o jsonpath="{.items[*].metadata.name}")' \ @@ -1776,8 +1856,21 @@ nncp_cleanup: ## unconfigured nncp configuration on worker node and deletes the .PHONY: netattach netattach: export INTERFACE=${NNCP_INTERFACE} -netattach: export VLAN_START=${NETWORK_VLAN_START} -netattach: export VLAN_STEP=${NETWORK_VLAN_STEP} +netattach: export INTERFACE_DATA=${NNCP_INTERFACE_DATA} +netattach: export INTERFACE_MANAGEMENT=${NNCP_INTERFACE_MANAGEMENT} +netattach: export INTERFACE_EXTERNAL=${NNCP_INTERFACE_EXTERNAL} +netattach: export INTERNALAPI_VLAN=${NNCP_INTERNALAPI_VLAN} +netattach: export STORAGE_VLAN=${NNCP_STORAGE_VLAN} +netattach: export TENANT_VLAN=${NNCP_TENANT_VLAN} +netattach: export INTERNALAPI_NET=${NNCP_INTERNALAPI_NET} +netattach: export STORAGE_NET=${NNCP_STORAGE_NET} +netattach: export TENANT_NET=${NNCP_TENANT_NET} +netattach: export INTERNALAPI_IP_START=${NETATTACH_INTERNALIP_IP_START} +netattach: export INTERNALAPI_IP_END=${NETATTACH_INTERNALIP_IP_END} +netattach: export STORAGE_IP_START=${NETATTACH_STORAGE_IP_START} +netattach: export STORAGE_IP_END=${NETATTACH_STORAGE_IP_END} +netattach: export TENANT_IP_START=${NETATTACH_TENANT_IP_START} +netattach: export TENANT_IP_END=${NETATTACH_TENANT_IP_END} netattach: namespace ## Creates network-attachment-definitions for the networks the workers are attached via nncp $(eval $(call vars,$@,netattach)) bash scripts/gen-netatt.sh @@ -1793,6 +1886,21 @@ netattach_cleanup: ## Deletes the network-attachment-definitions .PHONY: metallb metallb: export NAMESPACE=metallb-system metallb: export INTERFACE=${NNCP_INTERFACE} +metallb: export INTERFACE_DATA=${NNCP_INTERFACE_DATA} +metallb: export INTERFACE_MANAGEMENT=${NNCP_INTERFACE_MANAGEMENT} +metallb: export INTERFACE_EXTERNAL=${NNCP_INTERFACE_EXTERNAL} +metallb: export INTERNALAPI_VLAN=${NNCP_INTERNALAPI_VLAN} +metallb: export STORAGE_VLAN=${NNCP_STORAGE_VLAN} +metallb: export TENANT_VLAN=${NNCP_TENANT_VLAN} +metallb: export INTERNALAPI_NET=${NNCP_INTERNALAPI_NET} +metallb: export STORAGE_NET=${NNCP_STORAGE_NET} +metallb: export TENANT_NET=${NNCP_TENANT_NET} +metallb: export INTERNALAPI_IP_START=${METALLB_INTERNALIP_IP_START} +metallb: export INTERNALAPI_IP_END=${METALLB_INTERNALIP_IP_END} +metallb: export STORAGE_IP_START=${METALLB_STORAGE_IP_START} +metallb: export STORAGE_IP_END=${METALLB_STORAGE_IP_END} +metallb: export TENANT_IP_START=${METALLB_TENANT_IP_START} +metallb: export TENANT_IP_END=${METALLB_TENANT_IP_END} metallb: ## installs metallb operator in the metallb-system namespace $(eval $(call vars,$@,metallb)) bash scripts/gen-namespace.sh @@ -1812,6 +1920,21 @@ metallb: ## installs metallb operator in the metallb-system namespace metallb_config: export NAMESPACE=metallb-system metallb_config: export CTLPLANE_METALLB_POOL=${METALLB_POOL} metallb_config: export INTERFACE=${NNCP_INTERFACE} +metallb_config: export INTERFACE_DATA=${NNCP_INTERFACE_DATA} +metallb_config: export INTERFACE_MANAGEMENT=${NNCP_INTERFACE_MANAGEMENT} +metallb_config: export INTERFACE_EXTERNAL=${NNCP_INTERFACE_EXTERNAL} +metallb_config: export INTERNALAPI_VLAN=${NNCP_INTERNALAPI_VLAN} +metallb_config: export STORAGE_VLAN=${NNCP_STORAGE_VLAN} +metallb_config: export TENANT_VLAN=${NNCP_TENANT_VLAN} +metallb_config: export INTERNALAPI_NET=${NNCP_INTERNALAPI_NET} +metallb_config: export STORAGE_NET=${NNCP_STORAGE_NET} +metallb_config: export TENANT_NET=${NNCP_TENANT_NET} +metallb_config: export INTERNALAPI_IP_START=${METALLB_INTERNALIP_IP_START} +metallb_config: export INTERNALAPI_IP_END=${METALLB_INTERNALIP_IP_END} +metallb_config: export STORAGE_IP_START=${METALLB_STORAGE_IP_START} +metallb_config: export STORAGE_IP_END=${METALLB_STORAGE_IP_END} +metallb_config: export TENANT_IP_START=${METALLB_STORAGE_IP_START} +metallb_config: export TENANT_IP_END=${METALLB_STORAGE_IP_END} metallb_config: metallb_config_cleanup ## creates the IPAddressPools and l2advertisement resources $(eval $(call vars,$@,metallb)) bash scripts/gen-olm-metallb.sh diff --git a/devsetup/Makefile b/devsetup/Makefile index 06a2458..7994957 100644 --- a/devsetup/Makefile +++ b/devsetup/Makefile @@ -30,6 +30,7 @@ EDPM_COMPUTE_SUFFIX ?= 0 EDPM_COMPUTE_ADDITIONAL_NETWORKS ?= '[]' EDPM_TOTAL_NODES ?= 1 NETWORK_MTU ?= 1500 +TIMEOUT_VALUE ?= 120 BMAAS_INSTANCE_NAME_PREFIX ?= crc-bmaas BMAAS_INSTANCE_MEMORY ?= 4096 @@ -61,6 +62,8 @@ STANDALONE_COMPUTE_DRIVER ?= libvirt CLEANUP_DIR_CMD ?= rm -Rf +STATIC_MAC_PREFIX ?=52:54:00 + define vars ${1}: export CLEANUP_DIR_CMD=${CLEANUP_DIR_CMD} endef @@ -101,9 +104,20 @@ crc_cleanup: ## Destroys the CRC env, but does NOT clear ( --clear-cache ) the c sudo ${CLEANUP_DIR_CMD} /etc/pki/ca-trust/source/anchors/crc-router-ca.pem sudo update-ca-trust +.PHONY: crc_add_multi_interfaces +crc_add_multi_interfaces: export TIMEOUT=${TIMEOUT_VALUE} +crc_add_multi_interfaces: export MAC_PREFIX=${STATIC_MAC_PREFIX} +crc_add_multi_interfaces: crc_remove_multi_interfaces + bash scripts/crc_add_multi_interfaces.sh + +.PHONY: crc_remove_multi_interfaces +crc_remove_multi_interfaces: export TIMEOUT=${TIMEOUT_VALUE} +crc_remove_multi_interfaces: + bash scripts/crc_del_multi_interfaces.sh + .PHONY: crc_attach_default_interface crc_attach_default_interface: crc_attach_default_interface_cleanup ## Attach default libvirt network to CRC - MAC_ADDRESS=$(shell echo -n 52:54:00; dd bs=1 count=3 if=/dev/random 2>/dev/null | hexdump -v -e '/1 "-%02X"' | tr '-' ':'); \ + MAC_ADDRESS=$(shell echo -n ${STATIC_MAC_PREFIX}; dd bs=1 count=3 if=/dev/random 2>/dev/null | hexdump -v -e '/1 "-%02X"' | tr '-' ':'); \ virsh --connect=qemu:///system net-update default add-last ip-dhcp-host --xml "" --config --live; \ virsh --connect=qemu:///system attach-interface crc --source default --type network --model virtio --mac $$MAC_ADDRESS --config --persistent; \ sleep 10; \ @@ -154,6 +168,7 @@ edpm_baremetal_compute_cleanup: ## Cleanup dataplane with BMAAS make bmaas_virtual_bms_cleanup || true .PHONY: edpm_compute +edpm_compute: export MAC_PREFIX = ${STATIC_MAC_PREFIX} edpm_compute: ## Create EDPM compute VM $(eval $(call vars)) scripts/gen-ansibleee-ssh-key.sh @@ -241,6 +256,7 @@ bmaas_network_cleanup: ## Delete libvirt BMaaS network .PHONY: bmaas_crc_attach_network bmaas_crc_attach_network: export NETWORK_NAME = ${BMAAS_NETWORK_NAME} +bmaas_crc_attach_network: export MAC_PREFIX = ${STATIC_MAC_PREFIX} bmaas_crc_attach_network: ## Attach BMaaS network to CRC scripts/bmaas/attach-network.sh --create diff --git a/devsetup/scripts/bmaas/attach-network.sh b/devsetup/scripts/bmaas/attach-network.sh index fa87d30..1f41c61 100755 --- a/devsetup/scripts/bmaas/attach-network.sh +++ b/devsetup/scripts/bmaas/attach-network.sh @@ -22,7 +22,7 @@ trap 'rm -rf -- "$MY_TMP_DIR"' EXIT function attach_network { local mac_address - mac_address=$(echo -n 52:54:00; dd bs=1 count=3 if=/dev/random 2>/dev/null | hexdump -v -e '/1 "-%02X"' | tr '-' ':') + mac_address=$(echo -n $MAC_PREFIX; dd bs=1 count=3 if=/dev/random 2>/dev/null | hexdump -v -e '/1 "-%02X"' | tr '-' ':') virsh --connect=qemu:///system \ attach-interface crc \ --source "${NETWORK_NAME}" \ diff --git a/devsetup/scripts/crc_add_multi_interfaces.sh b/devsetup/scripts/crc_add_multi_interfaces.sh new file mode 100644 index 0000000..04dec0c --- /dev/null +++ b/devsetup/scripts/crc_add_multi_interfaces.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +if [ -z "$TIMEOUT" ]; then + echo "$0: Please set TIMEOUT." + exit 1 +fi + +NEED_REBOOT=0 + +for network in data management external; do + export NETWORK_NAME=$network + bash scripts/bmaas/network-attachement-definition.sh --create + if [[ $? == 0 ]]; then + NEED_REBOOT=1 + fi + sleep 1 +done +if [[ $NEED_REBOOT == 1 ]]; then + bash scripts/crc_reboot.sh +fi diff --git a/devsetup/scripts/crc_del_multi_interfaces.sh b/devsetup/scripts/crc_del_multi_interfaces.sh new file mode 100644 index 0000000..b811605 --- /dev/null +++ b/devsetup/scripts/crc_del_multi_interfaces.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +if [ -z "$TIMEOUT" ]; then + echo "$0: Please set TIMEOUT." + exit 1 +fi + +NEED_REBOOT=0 + +for network in data management external; do + MAC_ADDRESS=$(virsh --connect=qemu:///system dumpxml crc | grep "source network='$network'" -B1 | grep mac | cut -d"'" -f2); + if [ "x$MAC_ADDRESS" != "x" ]; then + NEED_REBOOT=1 + virsh --connect=qemu:///system detach-interface --domain crc --type network --mac $$MAC_ADDRESS --config; + fi + sleep 1 +done +if [[ $NEED_REBOOT == 1 ]]; then + bash scripts/crc_reboot.sh +fi diff --git a/devsetup/scripts/crc_reboot.sh b/devsetup/scripts/crc_reboot.sh new file mode 100644 index 0000000..cbe83ef --- /dev/null +++ b/devsetup/scripts/crc_reboot.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +if [ -z "$TIMEOUT" ]; then + echo "$0: Please set TIMEOUT." + exit 1 +fi + +virsh --connect=qemu:///system destroy crc +timeout --foreground ${TIMEOUT} bash -c 'until $(virsh --connect=qemu:///system list --all | grep crc | grep -q "shut off"); do sleep 1; done' +virsh --connect=qemu:///system start crc +timeout --foreground ${TIMEOUT} bash -c 'until $(virsh --connect=qemu:///system list --all | grep crc | grep -q "running"); do sleep 1; done' + diff --git a/devsetup/scripts/gen-edpm-compute-node.sh b/devsetup/scripts/gen-edpm-compute-node.sh index 9838f46..df6e41b 100755 --- a/devsetup/scripts/gen-edpm-compute-node.sh +++ b/devsetup/scripts/gen-edpm-compute-node.sh @@ -47,7 +47,7 @@ DISK_FILENAME=${DISK_FILENAME:-"edpm-compute-${EDPM_COMPUTE_SUFFIX}.qcow2"} DISK_FILEPATH=${DISK_FILEPATH:-"${CRC_POOL}/${DISK_FILENAME}"} SSH_PUBLIC_KEY=${SSH_PUBLIC_KEY:-"${OUTPUT_DIR}/ansibleee-ssh-key-id_rsa.pub"} -MAC_ADDRESS=${MAC_ADDRESS:-"$(echo -n 52:54:00; dd bs=1 count=3 if=/dev/random 2>/dev/null | hexdump -v -e '/1 "-%02X"' | tr '-' ':')"} +MAC_ADDRESS=${MAC_ADDRESS:-"$(echo -n $MAC_PREFIX; dd bs=1 count=3 if=/dev/random 2>/dev/null | hexdump -v -e '/1 "-%02X"' | tr '-' ':')"} IP_ADRESS_SUFFIX=${IP_ADRESS_SUFFIX:-"$((100+${EDPM_COMPUTE_SUFFIX}))"} if [ ! -f ${SSH_PUBLIC_KEY} ]; then diff --git a/scripts/gen-netatt.sh b/scripts/gen-netatt.sh index db86deb..41abb40 100644 --- a/scripts/gen-netatt.sh +++ b/scripts/gen-netatt.sh @@ -15,30 +15,52 @@ # under the License. set -ex -if [ -z "${DEPLOY_DIR}" ]; then - echo "Please set DEPLOY_DIR"; exit 1 -fi +function check_var_setted { + if [[ ! -v $1 ]]; then + echo "Please set $1"; exit 1 + fi +} + +check_var_setted DEPLOY_DIR if [ ! -d ${DEPLOY_DIR} ]; then mkdir -p ${DEPLOY_DIR} fi -if [ -z "${INTERFACE}" ]; then - echo "Please set INTERFACE"; exit 1 -fi - -if [ -z "${VLAN_START}" ]; then - echo "Please set VLAN_START"; exit 1 -fi - -if [ -z "${VLAN_STEP}" ]; then - echo "Please set VLAN_STEP"; exit 1 -fi +check_var_setted INTERFACE +check_var_setted INTERFACE_DATA +check_var_setted INTERFACE_MANAGEMENT +check_var_setted INTERFACE_EXTERNAL +check_var_setted INTERNALAPI_VLAN +check_var_setted STORAGE_VLAN +check_var_setted TENANT_VLAN +check_var_setted INTERNALAPI_NET +check_var_setted STORAGE_NET +check_var_setted TENANT_NET +check_var_setted INTERNALAPI_IP_START +check_var_setted INTERNALAPI_IP_END +check_var_setted STORAGE_IP_START +check_var_setted STORAGE_IP_END +check_var_setted TENANT_IP_START +check_var_setted TENANT_IP_END echo DEPLOY_DIR ${DEPLOY_DIR} echo INTERFACE ${INTERFACE} -echo VLAN_START ${VLAN_START} -echo VLAN_STEP ${VLAN_STEP} +echo INTERFACE_DATA ${INTERFACE_DATA} +echo INTERFACE_MANAGEMENT ${INTERFACE_MANAGEMENT} +echo INTERFACE_EXTERNAL ${INTERFACE_EXTERNAL} +echo INTERNALAPI_VLAN ${INTERNALAPI_VLAN} +echo STORAGE_VLAN ${STORAGE_VLAN} +echo TENANT_VLAN ${TENANT_VLAN} +echo INTERNALAPI_NET ${INTERNALAPI_NET} +echo STORAGE_NET ${STORAGE_NET} +echo TENANT_NET ${TENANT_NET} +echo INTERNALAPI_IP_START ${INTERNALAPI_IP_START} +echo INTERNALAPI_IP_END ${INTERNALAPI_IP_END} +echo STORAGE_IP_START ${STORAGE_IP_START} +echo STORAGE_IP_END ${STORAGE_IP_END} +echo TENANT_IP_START ${TENANT_IP_START} +echo TENANT_IP_END ${TENANT_IP_END} cat > ${DEPLOY_DIR}/ctlplane.yaml <> ${DEPLOY_DIR}/${WORKER}_nncp.yaml < ${DEPLOY_DIR}/l2advertisement.yaml <