updated heat templates for ceph nodes
Related-Prod: PRODX-2244
Change-Id: Id2a7c1c7e802ee1f297aad47c15844540e721eba
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 86324a6..70728ae 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -62,6 +62,12 @@
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'
worker_metadata:
type: json
default: {}
@@ -100,7 +106,7 @@
default: 'system.compact.openstack.control'
osds_flavor:
type: string
- default: 'system.compact.openstack.control'
+ default: 'system.virtual.ceph.osd'
ntws_flavor:
type: string
default: 'system.compact.openstack.control'
@@ -141,8 +147,16 @@
properties:
private_floating_network_cidr: { get_param: private_floating_network_cidr }
+ 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 }
+
ucp:
- depends_on: accessible_network
+ depends_on:
+ - accessible_network
+ - storage_network
type: MCP2::SrvInstances
properties:
metadata: {"role":"ucp"}
@@ -198,22 +212,26 @@
properties:
count: { get_param: worker_size }
resource_def:
- type: MCP2::SrvInstances
+ type: MCP2::SrvInstancesCephOSD
properties:
metadata: { get_param: worker_metadata}
node_type: "worker"
key_name: { get_param: "OS::stack_name" }
image: { get_param: image }
- flavor: { get_param: workers_flavor }
+ flavor: { get_param: osds_flavor }
key_name: { get_param: "OS::stack_name" }
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] }
@@ -226,21 +244,25 @@
properties:
count: { get_param: cmp_size }
resource_def:
- type: MCP2::SrvInstances
+ type: MCP2::SrvInstancesCephOSD
properties:
metadata: { get_param: cmp_metadata }
node_type: "worker"
key_name: { get_param: "OS::stack_name" }
image: { get_param: image }
- flavor: { get_param: cmps_flavor }
+ flavor: { get_param: osds_flavor }
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] }
@@ -280,7 +302,7 @@
properties:
count: { get_param: lma_size }
resource_def:
- type: MCP2::SrvInstances
+ type: MCP2::SrvInstancesCeph
properties:
metadata: { get_param: lma_metadata }
node_type: "worker"
@@ -290,11 +312,13 @@
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] }
@@ -307,7 +331,7 @@
properties:
count: { get_param: osd_size }
resource_def:
- type: MCP2::SrvInstances
+ type: MCP2::SrvInstancesCephOSD
properties:
metadata: { get_param: osd_metadata }
node_type: "worker"
@@ -317,11 +341,15 @@
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] }