Fixing baremetal deployment
Related-PROD: PRODX-2799
Change-Id: Ib037c8a23d6a9db39d4b7ceb2201a12e8b99d69d
diff --git a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
index ea2b9b6..c195d1d 100644
--- a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
@@ -65,20 +65,21 @@
sed -i 's/.*ethernets:.*/&\n veth-br: {}/' ${cloud_netplan_cfg}
sed -i "s/.*ethernets:.*/&\n $(echo ${PUBLIC_INTERFACE} | cut -d'.' -f1):\n dhcp4: false\n match:\n macaddress: ${public_if_mac}\n set-name: $(echo ${PUBLIC_INTERFACE} | cut -d'.' -f1)/" ${cloud_netplan_cfg}
+ if [ $STORAGE_FRONTEND_INTERFACE ]; then
+ STORAGE_FRONTEND_INTERFACE_DEF="
+ ${STORAGE_FRONTEND_INTERFACE}:
+ id: 404
+ link: $(echo ${STORAGE_FRONTEND_INTERFACE} | cut -d'.' -f1)
+ addresses: [ "${STORAGE_FRONTEND_INTERFACE_IP}/${STORAGE_FRONTEND_NETWORK_NETMASK}" ]
+ "
+ fi
+
cat << EOF >> ${cloud_netplan_cfg}
vlans:
${PUBLIC_INTERFACE}:
id: 403
link: $(echo ${PUBLIC_INTERFACE} | cut -d'.' -f1)
- ${STORAGE_FRONTEND_INTERFACE}:
- id: 404
- link: $(echo ${STORAGE_FRONTEND_INTERFACE} | cut -d'.' -f1)
- addresses: [ "${STORAGE_FRONTEND_INTERFACE_IP}/${STORAGE_FRONTEND_NETWORK_NETMASK}" ]
- ${STORAGE_BACKEND_INTERFACE}:
- id: 405
- link: $(echo ${STORAGE_BACKEND_INTERFACE} | cut -d'.' -f1)
- addresses: [ "${STORAGE_BACKEND_INTERFACE_IP}/${STORAGE_BACKEND_NETWORK_NETMASK}" ]
-
+ ${STORAGE_FRONTEND_INTERFACE_DEF}
bridges:
br-public:
dhcp4: false
diff --git a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml
index 06cb4e3..d333f28 100644
--- a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml
@@ -65,19 +65,21 @@
sed -i 's/.*ethernets:.*/&\n veth-br: {}/' ${cloud_netplan_cfg}
sed -i "s/.*ethernets:.*/&\n $(echo ${PUBLIC_INTERFACE} | cut -d'.' -f1):\n dhcp4: false\n match:\n macaddress: ${public_if_mac}\n set-name: $(echo ${PUBLIC_INTERFACE} | cut -d'.' -f1)/" ${cloud_netplan_cfg}
+ if [ $STORAGE_FRONTEND_INTERFACE ]; then
+ STORAGE_FRONTEND_INTERFACE_DEF="
+ ${STORAGE_FRONTEND_INTERFACE}:
+ id: 404
+ link: $(echo ${STORAGE_FRONTEND_INTERFACE} | cut -d'.' -f1)
+ addresses: [ "${STORAGE_FRONTEND_INTERFACE_IP}/${STORAGE_FRONTEND_NETWORK_NETMASK}" ]
+ "
+ fi
+
cat << EOF >> ${cloud_netplan_cfg}
vlans:
${PUBLIC_INTERFACE}:
id: 403
link: $(echo ${PUBLIC_INTERFACE} | cut -d'.' -f1)
- ${STORAGE_FRONTEND_INTERFACE}:
- id: 404
- link: $(echo ${STORAGE_FRONTEND_INTERFACE} | cut -d'.' -f1)
- addresses: [ "${STORAGE_FRONTEND_INTERFACE_IP}/${STORAGE_FRONTEND_NETWORK_NETMASK}" ]
- ${STORAGE_BACKEND_INTERFACE}:
- id: 405
- link: $(echo ${STORAGE_BACKEND_INTERFACE} | cut -d'.' -f1)
- addresses: [ "${STORAGE_BACKEND_INTERFACE_IP}/${STORAGE_BACKEND_NETWORK_NETMASK}" ]
+ ${STORAGE_FRONTEND_INTERFACE_DEF}
bridges:
br-public:
dhcp4: false