aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/heat/onap-rke/parts
diff options
context:
space:
mode:
Diffstat (limited to 'deployment/heat/onap-rke/parts')
-rw-r--r--deployment/heat/onap-rke/parts/onap-oom-1.yaml20
-rw-r--r--deployment/heat/onap-rke/parts/onap-oom-2.yaml5
-rw-r--r--deployment/heat/onap-rke/parts/onap-oom-3.yaml12
3 files changed, 13 insertions, 24 deletions
diff --git a/deployment/heat/onap-rke/parts/onap-oom-1.yaml b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
index 0e0cb0fcd..d210f985d 100644
--- a/deployment/heat/onap-rke/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
@@ -24,18 +24,14 @@ parameters:
type: string
description: Name of the Ubuntu 18.04 image
- rancher_vm_flavor:
+ nfs_vm_flavor:
type: string
- description: VM flavor for Rancher
+ description: VM flavor for Nfs
k8s_vm_flavor:
type: string
description: VM flavor for k8s hosts
- etcd_vm_flavor:
- type: string
- description: VM flavor for etcd hosts
-
orch_vm_flavor:
type: string
description: VM flavor for orch hosts
@@ -84,11 +80,6 @@ parameters:
type: string
default: "3m"
- use_ramdisk:
- type: string
- description: Set to "true" if you want to use a RAM disk for /dockerdata-nfs/.
- default: "false"
-
mtu:
type: number
default: 1500
@@ -191,7 +182,7 @@ resources:
router_id: { get_resource: router }
subnet_id: { get_resource: oam_ext_subnet }
- rancher_private_port:
+ nfs_private_port:
type: OS::Neutron::Port
properties:
network: { get_resource: oam_network }
@@ -199,9 +190,8 @@ resources:
security_groups:
- { get_resource: onap_sg }
- rancher_floating_ip:
+ nfs_floating_ip:
type: OS::Neutron::FloatingIP
properties:
floating_network_id: { get_param: public_net_id }
- port_id: { get_resource: rancher_private_port }
-
+ port_id: { get_resource: nfs_private_port }
diff --git a/deployment/heat/onap-rke/parts/onap-oom-2.yaml b/deployment/heat/onap-rke/parts/onap-oom-2.yaml
index bd4ba1fc0..1b63e4165 100644
--- a/deployment/heat/onap-rke/parts/onap-oom-2.yaml
+++ b/deployment/heat/onap-rke/parts/onap-oom-2.yaml
@@ -29,8 +29,8 @@
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__docker_version__: { get_param: docker_version }
- __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
- __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] }
+ __nfs_ip_addr__: { get_attr: [nfs_floating_ip, floating_ip_address] }
+ __nfs_private_ip_addr__: { get_attr: [nfs_floating_ip, fixed_ip_address] }
__host_private_ip_addr__: { get_attr: [${VM_TYPE}_${VM_NUM}_floating_ip, fixed_ip_address] }
__mtu__: { get_param: mtu }
template:
@@ -67,4 +67,3 @@
- port: { get_resource: ${VM_TYPE}_${VM_NUM}_private_port }
user_data_format: SOFTWARE_CONFIG
user_data: { get_resource: ${VM_TYPE}_${VM_NUM}_vm_config }
-
diff --git a/deployment/heat/onap-rke/parts/onap-oom-3.yaml b/deployment/heat/onap-rke/parts/onap-oom-3.yaml
index ca71d61fd..b70150240 100644
--- a/deployment/heat/onap-rke/parts/onap-oom-3.yaml
+++ b/deployment/heat/onap-rke/parts/onap-oom-3.yaml
@@ -2,11 +2,11 @@ outputs:
docker_proxy:
value: { get_param: docker_proxy }
- rancher_vm_ip:
- description: The IP address of the rancher instance
- value: { get_attr: [rancher_floating_ip, floating_ip_address] }
+ nfs_vm_ip:
+ description: The IP address of the nfs instance
+ value: { get_attr: [nfs_floating_ip, floating_ip_address] }
- rancher_vm_private_ip:
- description: The private IP address of the rancher instance
- value: { get_attr: [rancher_floating_ip, fixed_ip_address] }
+ nfs_vm_private_ip:
+ description: The private IP address of the nfs instance
+ value: { get_attr: [nfs_floating_ip, fixed_ip_address] }