Adding Ceph network for baremetal deployment
Related-PROD: PRODX-2799
Change-Id: I396bae0846f58c581a69bab8faad03d3ff82ae6d
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 d40b94c..a649419 100644
--- a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp0-gtw0.yaml
@@ -2,6 +2,9 @@
"MCP2::NetworkAcc": ../fragments/NetworkAccBM.yaml
"MCP2::NetworkPrvFl": ../fragments/NetworkPrvFl.yaml
"MCP2::SrvInstances": ../fragments/SrvInstancesBM.yaml
+ "MCP2::NetworkAccStorage": ../fragments/NetworkAccVMStorage.yaml
+ "MCP2::SrvInstancesCeph": ../fragments/SrvInstancesBMCeph.yaml
+ "MCP2::SrvInstancesCephOSD": ../fragments/SrvInstancesBMCephOSD.yaml
parameters:
image: bionic-server-cloudimg-amd64-20190612
@@ -30,6 +33,8 @@
private_floating_network_gateway: '172.16.49.129'
metallb_address_pools: [ '172.16.49.161-172.16.49.190' ]
private_floating_interface: 'enp3s0f1.403'
+ storage_frontend_interface: 'enp3s0f1.404'
+ storage_backend_interface: 'enp3s0f1.405'
worker_metadata: {"labels": {"openstack-control-plane":"enabled","openstack-compute-node":"enabled","openvswitch":"enabled","role":"ceph-osd-node"}}
cmp_metadata: {"labels": {"openstack-compute-node":"enabled","openvswitch":"enabled", "role":"ceph-osd-node"}}
gtw_metadata: {"labels": {"openvswitch":"enabled"}}
@@ -65,6 +70,15 @@
${PUBLIC_INTERFACE}:
id: 403
link: $(echo ${PUBLIC_INTERFACE} | cut -d'.' -f1)
+ ${STORAGE_FRONTEND_INTERFACE}:
+ id: 404
+ link: $(echo ${STORAGE_FRONTEND_INTERFACE} | cut -d'.' -f1)
+ addresses: [ "${STORAGE_FRONTEND_INTERFACE_IP}/${STORAGE_FRONTEND_NETWORK_NETMASK}" ]
+ ${STORAGE_BACKEND_INTERFACE}:
+ id: 405
+ link: $(echo ${STORAGE_BACKEND_INTERFACE} | cut -d'.' -f1)
+ addresses: [ "${STORAGE_BACKEND_INTERFACE_IP}/${STORAGE_BACKEND_NETWORK_NETMASK}" ]
+
bridges:
br-public:
dhcp4: false
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 7e77caf..a8596b7 100644
--- a/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/bmt402-mstr1-wrkr3-cmp2-gtw0.yaml
@@ -2,6 +2,9 @@
"MCP2::NetworkAcc": ../fragments/NetworkAccBM.yaml
"MCP2::NetworkPrvFl": ../fragments/NetworkPrvFl.yaml
"MCP2::SrvInstances": ../fragments/SrvInstancesBM.yaml
+ "MCP2::NetworkAccStorage": ../fragments/NetworkAccVMStorage.yaml
+ "MCP2::SrvInstancesCeph": ../fragments/SrvInstancesBMCeph.yaml
+ "MCP2::SrvInstancesCephOSD": ../fragments/SrvInstancesBMCephOSD.yaml
parameters:
image: bionic-server-cloudimg-amd64-20190612
@@ -30,6 +33,8 @@
private_floating_network_gateway: '172.16.49.129'
metallb_address_pools: [ '172.16.49.161-172.16.49.190' ]
private_floating_interface: 'enp3s0f1.403'
+ storage_frontend_interface: 'enp3s0f1.404'
+ storage_backend_interface: 'enp3s0f1.405'
worker_metadata: {"labels": {"openstack-control-plane":"enabled","openvswitch":"enabled","role":"ceph-osd-node"}}
cmp_metadata: {"labels": {"openstack-compute-node":"enabled","openvswitch":"enabled", "role":"ceph-osd-node"}}
gtw_metadata: {"labels": {"openvswitch":"enabled"}}
@@ -65,6 +70,14 @@
${PUBLIC_INTERFACE}:
id: 403
link: $(echo ${PUBLIC_INTERFACE} | cut -d'.' -f1)
+ ${STORAGE_FRONTEND_INTERFACE}:
+ id: 404
+ link: $(echo ${STORAGE_FRONTEND_INTERFACE} | cut -d'.' -f1)
+ addresses: [ "${STORAGE_FRONTEND_INTERFACE_IP}/${STORAGE_FRONTEND_NETWORK_NETMASK}" ]
+ ${STORAGE_BACKEND_INTERFACE}:
+ id: 405
+ link: $(echo ${STORAGE_BACKEND_INTERFACE} | cut -d'.' -f1)
+ addresses: [ "${STORAGE_BACKEND_INTERFACE_IP}/${STORAGE_BACKEND_NETWORK_NETMASK}" ]
bridges:
br-public:
dhcp4: false
diff --git a/de/heat-templates/fragments/NetworkAccVMStorage.yaml b/de/heat-templates/fragments/NetworkAccVMStorage.yaml
index 154976f..f1475b3 100644
--- a/de/heat-templates/fragments/NetworkAccVMStorage.yaml
+++ b/de/heat-templates/fragments/NetworkAccVMStorage.yaml
@@ -14,7 +14,7 @@
type: OS::Neutron::Subnet
properties:
network: { get_resource: storage_backend_network }
- enable_dhcp: true
+ enable_dhcp: false
cidr: { get_param: storage_backend_network_cidr }
gateway_ip: ~
@@ -24,7 +24,7 @@
type: OS::Neutron::Subnet
properties:
network: { get_resource: storage_frontend_network }
- enable_dhcp: true
+ enable_dhcp: false
cidr: { get_param: storage_frontend_network_cidr }
gateway_ip: ~
diff --git a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
new file mode 100644
index 0000000..19e6543
--- /dev/null
+++ b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
@@ -0,0 +1,130 @@
+heat_template_version: queens
+
+parameters:
+
+ metadata:
+ type: json
+ default: {}
+ node_type:
+ type: string
+ key_name:
+ type: string
+ description: Name of keypair to assign to servers
+ image:
+ type: string
+ description: Name of image to use for servers
+ flavor:
+ type: string
+ description: Flavor to use for servers
+ accessible_network:
+ type: string
+ accessible_subnet_id:
+ type: string
+ private_floating_network:
+ type: string
+ private_floating_network_cidr:
+ type: string
+ private_floating_subnet_id:
+ type: string
+ private_floating_interface:
+ type: string
+ storage_frontend_network_cidr:
+ type: string
+ storage_frontend_network:
+ type: string
+ storage_frontend_subnet_id:
+ type: string
+ host_interface:
+ type: string
+ functions_override:
+ type: string
+ boot_timeout:
+ type: number
+ description: Boot timeout for instance
+ default: 1200
+ ucp_master_host:
+ type: string
+ default: ''
+ public_net_id:
+ type: string
+ default: ''
+ docker_ee_release:
+ type: string
+ docker_ee_url:
+ type: string
+
+resources:
+
+ software_config:
+ type: OS::Heat::SoftwareConfig
+ properties:
+ group: ungrouped
+ config:
+ str_replace:
+ template: { get_file: ../scripts/instance_boot.sh }
+ params:
+ $node_type: { get_param: node_type }
+ $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
+ $ucp_license_key: { get_file: ../scripts/license.lic }
+ $docker_ee_url: { get_param: docker_ee_url }
+ $docker_ee_release: { get_param: docker_ee_release }
+ $ucp_master_host: { get_param: ucp_master_host }
+ $node_metadata: { get_param: metadata }
+ $host_interface: { get_param: host_interface }
+ $private_floating_interface: { get_param: private_floating_interface }
+ $private_floating_network_cidr: { get_param: private_floating_network_cidr }
+ $private_floating_interface_ip: { get_attr: [private_floating_server_port, fixed_ips, 0, ip_address] }
+ $functions_override: { get_param: functions_override }
+ $storage_frontend_network_interface_ip: { get_attr: [storage_frontend_server_port, fixed_ips, 0, ip_address] }
+ $storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
+
+ server:
+ type: OS::Nova::Server
+ properties:
+ image: { get_param: image }
+ flavor: { get_param: flavor }
+ key_name: { get_param: key_name }
+ availability_zone: nova
+ networks:
+ - network: { get_param: accessible_network }
+ # NOTE(ohryhorov): connect to accessible network only as ironic doesn't
+ # support multitenancy use-case. Use private_floating_network for IPAM only.
+ user_data_format: RAW
+ user_data: { get_resource: software_config }
+ metadata: { get_param: metadata }
+
+ private_floating_server_port:
+ type: OS::Neutron::Port
+ properties:
+ network_id: { get_param: private_floating_network }
+ port_security_enabled: false
+ fixed_ips:
+ - subnet: { get_param: private_floating_subnet_id }
+
+ storage_frontend_server_port:
+ type: OS::Neutron::Port
+ properties:
+ network_id: { get_param: storage_frontend_network }
+ port_security_enabled: false
+ fixed_ips:
+ - subnet: { get_param: storage_frontend_subnet_id }
+
+ wait_handle:
+ type: OS::Heat::WaitConditionHandle
+ wait_condition:
+ type: OS::Heat::WaitCondition
+ properties:
+ handle: { get_resource: wait_handle }
+ timeout: { get_param: boot_timeout }
+
+
+outputs:
+ server_private_ip:
+ description: IP address of server in private network
+ value: { get_attr: [server, networks, { get_param: accessible_network}, 0]}
+ server_private_floating_ip:
+ description: IP address of server in private floating network
+ value: { get_attr: [private_floating_server_port, fixed_ips, 0, ip_address] }
+ server_public_ip:
+ description: Floating IP address of server in public network
+ value: { get_attr: [server, networks, { get_param: accessible_network}, 0]}
diff --git a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
new file mode 100644
index 0000000..0991319
--- /dev/null
+++ b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
@@ -0,0 +1,152 @@
+heat_template_version: queens
+
+parameters:
+
+ metadata:
+ type: json
+ default: {}
+ node_type:
+ type: string
+ key_name:
+ type: string
+ description: Name of keypair to assign to servers
+ image:
+ type: string
+ description: Name of image to use for servers
+ flavor:
+ type: string
+ description: Flavor to use for servers
+ accessible_network:
+ type: string
+ accessible_subnet_id:
+ type: string
+ private_floating_network:
+ type: string
+ private_floating_network_cidr:
+ type: string
+ private_floating_subnet_id:
+ type: string
+ private_floating_interface:
+ type: string
+ storage_backend_network_cidr:
+ type: string
+ storage_backend_network:
+ type: string
+ storage_backend_subnet_id:
+ type: string
+ storage_backend_interface:
+ type: string
+ storage_frontend_network:
+ type: string
+ storage_frontend_network_cidr:
+ type: string
+ storage_frontend_subnet_id:
+ type: string
+ storage_frontend_interface:
+ type: string
+ host_interface:
+ type: string
+ functions_override:
+ type: string
+ boot_timeout:
+ type: number
+ description: Boot timeout for instance
+ default: 1200
+ ucp_master_host:
+ type: string
+ default: ''
+ public_net_id:
+ type: string
+ default: ''
+ docker_ee_release:
+ type: string
+ docker_ee_url:
+ type: string
+
+resources:
+
+ software_config:
+ type: OS::Heat::SoftwareConfig
+ properties:
+ group: ungrouped
+ config:
+ str_replace:
+ template: { get_file: ../scripts/instance_boot.sh }
+ params:
+ $node_type: { get_param: node_type }
+ $wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
+ $ucp_license_key: { get_file: ../scripts/license.lic }
+ $docker_ee_url: { get_param: docker_ee_url }
+ $docker_ee_release: { get_param: docker_ee_release }
+ $ucp_master_host: { get_param: ucp_master_host }
+ $node_metadata: { get_param: metadata }
+ $host_interface: { get_param: host_interface }
+ $private_floating_interface: { get_param: private_floating_interface }
+ $private_floating_network_cidr: { get_param: private_floating_network_cidr }
+ $private_floating_interface_ip: { get_attr: [private_floating_server_port, fixed_ips, 0, ip_address] }
+ $functions_override: { get_param: functions_override }
+ $storage_frontend_interface: { get_param: storage_frontend_interface }
+ $storage_frontend_network_interface_ip: { get_attr: [storage_frontend_server_port, fixed_ips, 0, ip_address] }
+ $storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
+ $storage_backend_interface: { get_param: storage_backend_interface }
+ $storage_backend_network_interface_ip: { get_attr: [storage_backend_server_port, fixed_ips, 0, ip_address] }
+ $storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
+
+ server:
+ type: OS::Nova::Server
+ properties:
+ image: { get_param: image }
+ flavor: { get_param: flavor }
+ key_name: { get_param: key_name }
+ availability_zone: nova
+ networks:
+ - network: { get_param: accessible_network }
+ # NOTE(ohryhorov): connect to accessible network only as ironic doesn't
+ # support multitenancy use-case. Use private_floating_network for IPAM only.
+ user_data_format: RAW
+ user_data: { get_resource: software_config }
+ metadata: { get_param: metadata }
+
+ private_floating_server_port:
+ type: OS::Neutron::Port
+ properties:
+ network_id: { get_param: private_floating_network }
+ port_security_enabled: false
+ fixed_ips:
+ - subnet: { get_param: private_floating_subnet_id }
+
+ storage_backend_server_port:
+ type: OS::Neutron::Port
+ properties:
+ network_id: { get_param: storage_backend_network }
+ port_security_enabled: false
+ fixed_ips:
+ - subnet: { get_param: storage_backend_subnet_id }
+
+ storage_frontend_server_port:
+ type: OS::Neutron::Port
+ properties:
+ network_id: { get_param: storage_frontend_network }
+ port_security_enabled: false
+ fixed_ips:
+ - subnet: { get_param: storage_frontend_subnet_id }
+
+ wait_handle:
+ type: OS::Heat::WaitConditionHandle
+ wait_condition:
+ type: OS::Heat::WaitCondition
+ properties:
+ handle: { get_resource: wait_handle }
+ timeout: { get_param: boot_timeout }
+
+
+outputs:
+ server_private_ip:
+ description: IP address of server in private network
+ value: { get_attr: [server, networks, { get_param: accessible_network}, 0]}
+ server_private_floating_ip:
+ description: IP address of server in private floating network
+ value: { get_attr: [private_floating_server_port, fixed_ips, 0, ip_address] }
+ server_public_ip:
+ description: Floating IP address of server in public network
+ value: { get_attr: [server, networks, { get_param: accessible_network}, 0]}
diff --git a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
index 12bdc2b..cf843fd 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
@@ -28,6 +28,8 @@
type: string
private_floating_interface:
type: string
+ storage_frontend_network_cidr:
+ type: string
storage_frontend_network:
type: string
storage_frontend_subnet_id:
@@ -72,6 +74,8 @@
$private_floating_interface_ip: { get_attr: [private_floating_server_port, fixed_ips, 0, ip_address] }
$private_floating_network_cidr: { get_param: private_floating_network_cidr }
$functions_override: { get_param: functions_override }
+ $storage_frontend_network_interface_ip: { get_attr: [storage_frontend_server_port, fixed_ips, 0, ip_address] }
+ $storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
server:
type: OS::Nova::Server
diff --git a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
index 51d5228..0522672 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
@@ -28,14 +28,22 @@
type: string
private_floating_interface:
type: string
+ storage_backend_network_cidr:
+ type: string
storage_backend_network:
type: string
storage_backend_subnet_id:
type: string
+ storage_backend_interface:
+ type: string
storage_frontend_network:
type: string
+ storage_frontend_network_cidr:
+ type: string
storage_frontend_subnet_id:
type: string
+ storage_frontend_interface:
+ type: string
host_interface:
type: string
functions_override:
@@ -76,6 +84,12 @@
$private_floating_interface_ip: { get_attr: [private_floating_server_port, fixed_ips, 0, ip_address] }
$private_floating_network_cidr: { get_param: private_floating_network_cidr }
$functions_override: { get_param: functions_override }
+ $storage_frontend_interface: { get_param: storage_frontend_interface }
+ $storage_frontend_network_interface_ip: { get_attr: [storage_frontend_server_port, fixed_ips, 0, ip_address] }
+ $storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
+ $storage_backend_interface: { get_param: storage_backend_interface }
+ $storage_backend_network_interface_ip: { get_attr: [storage_backend_server_port, fixed_ips, 0, ip_address] }
+ $storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
server:
type: OS::Nova::Server
@@ -87,8 +101,8 @@
networks:
- port: { get_resource: accessible_server_port }
- port: { get_resource: private_floating_server_port }
- - port: { get_resource: storage_backend_server_port }
- port: { get_resource: storage_frontend_server_port }
+ - port: { get_resource: storage_backend_server_port }
user_data_format: RAW
user_data: { get_resource: software_config }
metadata: { get_param: metadata }
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 79f038f..a1928b0 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -9,6 +9,14 @@
PUBLIC_INTERFACE_IP=$private_floating_interface_ip
PUBLIC_INTERFACE_CIDR=$private_floating_network_cidr
PUBLIC_INTERFACE_NETMASK=$(echo ${PUBLIC_INTERFACE_CIDR} | cut -d'/' -f2)
+STORAGE_BACKEND_INTERFACE=$storage_backend_interface
+STORAGE_BACKEND_INTERFACE_IP=$storage_backend_network_interface_ip
+STORAGE_BACKEND_NETWORK=$storage_backend_network_cidr
+STORAGE_BACKEND_NETWORK_NETMASK=$(echo ${STORAGE_BACKEND_NETWORK} | cut -d'/' -f2)
+STORAGE_FRONTEND_INTERFACE=$storage_frontend_interface
+STORAGE_FRONTEND_INTERFACE_IP=$storage_frontend_network_interface_ip
+STORAGE_FRONTEND_NETWORK=$storage_frontend_network_cidr
+STORAGE_FRONTEND_NETWORK_NETMASK=$(echo ${STORAGE_FRONTEND_NETWORK} | cut -d'/' -f2)
NODE_TYPE=$node_type
UCP_MASTER_HOST=$ucp_master_host
NODE_METADATA='$node_metadata'
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