Adding Ceph network for baremetal deployment
Related-PROD: PRODX-2799
Change-Id: I396bae0846f58c581a69bab8faad03d3ff82ae6d
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 397a75e..711588f 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -70,12 +70,18 @@
private_floating_interface:
description: Interface which carries floating network for child OpenStack.
type: string
- storage_backend_network_cidr:
- type: string
- default: '10.11.0.0/24'
storage_frontend_network_cidr:
type: string
default: '10.12.0.0/24'
+ storage_frontend_interface:
+ type: string
+ default: 'ens5'
+ storage_backend_network_cidr:
+ type: string
+ default: '10.11.0.0/24'
+ storage_backend_interface:
+ type: string
+ default: 'ens6'
worker_metadata:
type: json
default: {}
@@ -160,8 +166,8 @@
storage_network:
type: MCP2::NetworkAccStorage
properties:
- storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
+ storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
ucp:
depends_on:
@@ -186,7 +192,6 @@
host_interface: { get_param: host_interface }
functions_override: { get_param: functions_override }
-
masters:
type: OS::Heat::ResourceGroup
depends_on:
@@ -214,7 +219,6 @@
ucp_master_host: { get_attr: [ucp, server_private_ip] }
functions_override: { get_param: functions_override }
-
workers:
type: OS::Heat::ResourceGroup
depends_on:
@@ -233,19 +237,23 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
accessible_network: { get_attr: [accessible_network, public_network] }
- storage_backend_network: { get_attr: [storage_network, storage_backend_network_id]}
- storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id]}
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
private_floating_interface: { get_param: private_floating_interface }
private_floating_network_cidr: { get_param: private_floating_network_cidr }
accessible_subnet_id: { get_attr: [accessible_network, accessible_subnet_id]}
- storage_backend_subnet_id: { get_attr: [storage_network, storage_backend_subnet_id]}
- storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id]}
public_net_id: { get_param: public_net_id }
host_interface: { get_param: host_interface }
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 }
+ 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 }
cmps:
type: OS::Heat::ResourceGroup
@@ -264,19 +272,23 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
accessible_network: { get_attr: [accessible_network, public_network] }
- storage_backend_network: { get_attr: [storage_network, storage_backend_network_id] }
- storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
private_floating_interface: { get_param: private_floating_interface }
private_floating_network_cidr: { get_param: private_floating_network_cidr }
accessible_subnet_id: { get_attr: [accessible_network, accessible_subnet_id]}
- storage_backend_subnet_id: { get_attr: [storage_network, storage_backend_subnet_id]}
- storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id]}
public_net_id: { get_param: public_net_id }
host_interface: { get_param: host_interface }
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 }
+ 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 }
gtws:
type: OS::Heat::ResourceGroup
@@ -322,17 +334,19 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
accessible_network: { get_attr: [accessible_network, public_network] }
- storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
private_floating_interface: { get_param: private_floating_interface }
private_floating_network_cidr: { get_param: private_floating_network_cidr }
accessible_subnet_id: { get_attr: [accessible_network, accessible_subnet_id]}
- storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id]}
public_net_id: { get_param: public_net_id }
host_interface: { get_param: host_interface }
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 }
osds:
type: OS::Heat::ResourceGroup
@@ -351,19 +365,23 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
accessible_network: { get_attr: [accessible_network, public_network] }
- storage_backend_network: { get_attr: [storage_network, storage_backend_network_id] }
- storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
private_floating_interface: { get_param: private_floating_interface }
private_floating_network_cidr: { get_param: private_floating_network_cidr }
accessible_subnet_id: { get_attr: [accessible_network, accessible_subnet_id]}
- storage_backend_subnet_id: { get_attr: [storage_network, storage_backend_subnet_id]}
- storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id]}
public_net_id: { get_param: public_net_id }
host_interface: { get_param: host_interface }
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 }
+ 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 }
ntws:
type: OS::Heat::ResourceGroup