Change storage frontend network to private network
* Attach storage client network to ntw and gtw nodes
* Enable dhcp for storage networks
* Connect storage backend network to wrkrs as they might
be used for osds
Related-Prod: PRODX-3383
Change-Id: I87434cff9d23f9dc5267d351b3ff96f45b696c3a
diff --git a/de/heat-templates/env/compute.yaml b/de/heat-templates/env/compute.yaml
index d86cae9..27d746c 100644
--- a/de/heat-templates/env/compute.yaml
+++ b/de/heat-templates/env/compute.yaml
@@ -26,7 +26,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/converged.yaml b/de/heat-templates/env/converged.yaml
index 2a717dd..22dcc3e 100644
--- a/de/heat-templates/env/converged.yaml
+++ b/de/heat-templates/env/converged.yaml
@@ -26,7 +26,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml
index 5e0cee6..6ed7eef 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml
@@ -28,7 +28,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
index f8c5b41..eea6f9a 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
@@ -26,7 +26,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml
index 39a878b..ec642a5 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml
@@ -28,7 +28,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
index 01f4dcb..b156406 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
@@ -26,7 +26,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
index b05a078..af06f3e 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
@@ -29,7 +29,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
index 787cc14..80229a2 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
@@ -27,7 +27,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
index 4d83a5d..5cd5461 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
@@ -26,7 +26,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
index be632cb..ff191f8 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
@@ -27,7 +27,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
index bab863b..505f03b 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
@@ -26,7 +26,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
index 394b48a..475c6ba 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
@@ -26,7 +26,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp3-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp3-gtw0.yaml
index 8fb160f..320249e 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp3-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp3-gtw0.yaml
@@ -24,7 +24,7 @@
gtw_metadata: {"labels": {"openvswitch":"enabled"}}
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml
index 1ca19a9..4ab970f 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml
@@ -28,7 +28,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml
index fcf50c8..fa6bbd1 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml
@@ -23,7 +23,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml
index a6eb31d..487ed47 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml
@@ -28,7 +28,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml
index c61bde7..8e49e50 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml
@@ -26,7 +26,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml
index f85da29..194b9bf 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml
@@ -26,7 +26,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
index 4ba3500..4007c36 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
@@ -27,7 +27,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':
diff --git a/de/heat-templates/env/telco.yaml b/de/heat-templates/env/telco.yaml
index a759bff..f333e22 100644
--- a/de/heat-templates/env/telco.yaml
+++ b/de/heat-templates/env/telco.yaml
@@ -26,7 +26,7 @@
# ephemeral storage because it is used for Ceph bluestore.
workers_flavor: 'system.compact.openstack.control.ephemeral'
cmps_flavor: 'system.compact.openstack.control.ephemeral'
- 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'
hardware_metadata: |
'00:00:00:00:00:00':