commit 80db58cfd9a8baa9b08851a40c2a80516b6af6c4
author Oleh Hryhorov <ohryhorov@mirantis.com> Fri Mar 27 16:25:58 2020 +0000
committer Gerrit Code Review <mail@domain.com> Fri Mar 27 16:25:58 2020 +0000
tree a00f99dfd7079a94e33211f07cceb03a6d9a3151
parent 64e465fe3885253af78b07a6a8a2de1d2789df7d
parent 85d55b1707f48241a11626f5a901be8765fe20df

Merge "Change Ceph frontend network in BM lab"

de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml

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 baad16f..1a9dfbc 100644
--- a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
@@ -40,7 +40,7 @@
   gtw_metadata: {"labels": {"openvswitch":"enabled"}}
   tunnel_interface: 'enp3s0f0'
   live_migration_interface: 'enp3s0f0'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   functions_override: |
     function network_config {
@@ -76,12 +76,22 @@
      "
         fi
 
+        if [ $STORAGE_BACKEND_INTERFACE ]; then
+     STORAGE_BACKEND_INTERFACE_DEF="
+            ${STORAGE_BACKEND_INTERFACE}:
+                id: 405
+                link: $(echo ${STORAGE_BACKEND_INTERFACE} | cut -d'.' -f1)
+                addresses: [ "${STORAGE_BACKEND_INTERFACE_IP}/${STORAGE_BACKEND_NETWORK_NETMASK}" ]
+     "
+        fi
+
     cat << EOF >> ${cloud_netplan_cfg}
         vlans:
             ${PUBLIC_INTERFACE}:
                 id: 403
                 link: $(echo ${PUBLIC_INTERFACE} | cut -d'.' -f1)
             ${STORAGE_FRONTEND_INTERFACE_DEF}
+            ${STORAGE_BACKEND_INTERFACE_DEF}
         bridges:
             br-public:
                 dhcp4: false

de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml

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 19e145a..7e327a2 100644
--- a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml
@@ -40,7 +40,7 @@
   gtw_metadata: {"labels": {"openvswitch":"enabled"}}
   tunnel_interface: 'enp3s0f0'
   live_migration_interface: 'enp3s0f0'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   functions_override: |
     function network_config {
@@ -76,12 +76,22 @@
      "
         fi
 
+        if [ $STORAGE_BACKEND_INTERFACE ]; then
+     STORAGE_BACKEND_INTERFACE_DEF="
+            ${STORAGE_BACKEND_INTERFACE}:
+                id: 405
+                link: $(echo ${STORAGE_BACKEND_INTERFACE} | cut -d'.' -f1)
+                addresses: [ "${STORAGE_BACKEND_INTERFACE_IP}/${STORAGE_BACKEND_NETWORK_NETMASK}" ]
+     "
+        fi
+
     cat << EOF >> ${cloud_netplan_cfg}
         vlans:
             ${PUBLIC_INTERFACE}:
                 id: 403
                 link: $(echo ${PUBLIC_INTERFACE} | cut -d'.' -f1)
             ${STORAGE_FRONTEND_INTERFACE_DEF}
+            ${STORAGE_BACKEND_INTERFACE_DEF}
         bridges:
             br-public:
                 dhcp4: false