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/top.yaml b/de/heat-templates/top.yaml
index 0ce2437..d7d165f 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -250,7 +250,7 @@
properties:
count: { get_param: worker_size }
resource_def:
- type: MCP2::SrvInstancesCeph
+ type: MCP2::SrvInstancesCephOSD
properties:
metadata: { get_param: worker_metadata}
node_type: "worker"
@@ -274,6 +274,10 @@
storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id] }
storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
+ storage_backend_interface: { get_param: storage_backend_interface }
+ storage_backend_network: { get_attr: [storage_network, storage_backend_network_id] }
+ storage_backend_subnet_id: { get_attr: [storage_network, storage_backend_subnet_id] }
+ storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
hardware_metadata: { get_param: hardware_metadata}
cmps:
@@ -283,7 +287,7 @@
properties:
count: { get_param: cmp_size }
resource_def:
- type: MCP2::SrvInstancesCeph
+ type: MCP2::SrvInstancesCephOSD
properties:
metadata: { get_param: cmp_metadata }
node_type: "worker"
@@ -306,6 +310,10 @@
storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id] }
storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
+ storage_backend_interface: { get_param: storage_backend_interface }
+ storage_backend_network: { get_attr: [storage_network, storage_backend_network_id] }
+ storage_backend_subnet_id: { get_attr: [storage_network, storage_backend_subnet_id] }
+ storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
hardware_metadata: { get_param: hardware_metadata}
gtws:
@@ -315,7 +323,7 @@
properties:
count: { get_param: gtw_size }
resource_def:
- type: MCP2::SrvInstances
+ type: MCP2::SrvInstancesCeph
properties:
metadata: { get_param: gtw_metadata }
node_type: "worker"
@@ -334,6 +342,10 @@
control_network_cidr: { get_param: control_network_cidr }
ucp_master_host: { get_attr: [ucp, server_private_ip] }
functions_override: { get_param: functions_override }
+ storage_frontend_interface: { get_param: storage_frontend_interface }
+ storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
+ storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id] }
+ storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
hardware_metadata: { get_param: hardware_metadata}
lmas:
@@ -447,7 +459,7 @@
properties:
count: { get_param: ntw_size }
resource_def:
- type: MCP2::SrvInstances
+ type: MCP2::SrvInstancesCeph
properties:
metadata: { get_param: ntw_metadata }
node_type: "worker"
@@ -466,6 +478,10 @@
control_network_cidr: { get_param: control_network_cidr }
ucp_master_host: { get_attr: [ucp, server_private_ip] }
functions_override: { get_param: functions_override }
+ storage_frontend_interface: { get_param: storage_frontend_interface }
+ storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
+ storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id] }
+ storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
hardware_metadata: { get_param: hardware_metadata}
outputs: