summaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-10-23 10:26:16 -0400
committerMarco Platania <platania@research.att.com>2017-10-23 14:30:03 +0000
commita77e47fe73a8eaa373cf877e0640bb8835c1f7e3 (patch)
treeb9bf776b1cb69b950570c0d2117cb4b0d1eaf113 /heat
parent8ddf3e163f1931907e20addb60a4c9af21e5e9c5 (diff)
Clean up DCAE GEN 1 params from Heat template
Change-Id: Id76c7a561494f7aa201b728f1f62e88f198496cc Issue-ID: DCAEGEN2-127 Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'heat')
-rw-r--r--heat/ONAP/onap_openstack.env30
-rw-r--r--heat/ONAP/onap_openstack.yaml99
2 files changed, 45 insertions, 84 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index ac63b060..6a1593f5 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -12,8 +12,6 @@ parameters:
ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE
- centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE
-
flavor_small: PUT THE SMALL FLAVOR NAME HERE
flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE
@@ -24,18 +22,12 @@ parameters:
flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
- security_group: PUT THE NAME OF THE SECURITY GROUP HERE
-
vm_base_name: vm1
key_name: onap_key
- dcae_key_name: dcae_key
-
pub_key: PUT YOUR PUBLIC KEY HERE
- dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE
-
nexus_repo: https://nexus.onap.org/content/sites/raw
nexus_docker_repo: nexus3.onap.org:10001
@@ -98,11 +90,11 @@ parameters:
clamp_ip_addr: 10.0.12.1
openo_ip_addr: 10.0.14.1
- dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE
- dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE
- dcae_hdp1_float_ip: PUT DCAE HADOOP VM1 FLOATING IP HERE
- dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE
- dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE
+# dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE
+# dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE
+# dcae_hdp1_float_ip: PUT DCAE HADOOP VM1 FLOATING IP HERE
+# dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE
+# dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE
###########################
# #
@@ -110,19 +102,19 @@ parameters:
# #
###########################
- dcae_base_environment: 1-NIC-FLOATING-IPS
+# dcae_base_environment: 1-NIC-FLOATING-IPS
dcae_zone: ZONE
- dcae_state: STATE
+# dcae_state: STATE
- nexus_repo_root: https://nexus.onap.org
+# nexus_repo_root: https://nexus.onap.org
- nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
+# nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
- gitlab_branch: master
+# gitlab_branch: master
- dcae_code_version: 1.1.0
+# dcae_code_version: 1.1.0
dcaeos_cloud_env: PUT DACE TARGET DEPLOYMENT STACK'S FLAVOR (e.g. OpenStack) HERE
dcaeos_keystone_url: PUT DACE TARGET DEPLOYMENT STACK'S KEYSTONE URL HERE
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 31a8b3da..cf01778b 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -52,10 +52,6 @@ parameters:
type: string
description: Name of the Ubuntu 16.04 image
- centos_7_image:
- type: string
- description: Name of the CentOS 7 image
-
flavor_small:
type: string
description: Name of the Small Flavor supported by the cloud provider
@@ -76,10 +72,6 @@ parameters:
type: string
description: Name of the Extra Extra Large Flavor supported by the cloud provider
- security_group:
- type: string
- description: Security group used by DCAE GEN 2
-
vm_base_name:
type: string
description: Base name of ONAP VMs
@@ -88,18 +80,10 @@ parameters:
type: string
description: Public/Private key pair name
- dcae_key_name:
- type: string
- description: Public/Private key pair name for DCAE GEN 2
-
pub_key:
type: string
description: Public key to be installed on the compute instance
- dcae_pub_key:
- type: string
- description: Public key to be installed on the DCAE GEN 2 compute instance
-
nexus_repo:
type: string
description: Complete URL for the Nexus repository.
@@ -152,6 +136,10 @@ parameters:
type: string
description: Cloud Provider Name
+ openstack_region:
+ type: string
+ description: Region where the DCAE controller will spin the VMs
+
######################
# #
# Network parameters #
@@ -211,16 +199,16 @@ parameters:
type: string
openo_ip_addr:
type: string
- dcae_coll_float_ip:
- type: string
- dcae_db_float_ip:
- type: string
- dcae_hdp1_float_ip:
- type: string
- dcae_hdp2_float_ip:
- type: string
- dcae_hdp3_float_ip:
- type: string
+# dcae_coll_float_ip:
+# type: string
+# dcae_db_float_ip:
+# type: string
+# dcae_hdp1_float_ip:
+# type: string
+# dcae_hdp2_float_ip:
+# type: string
+# dcae_hdp3_float_ip:
+# type: string
###########################
# #
@@ -288,39 +276,33 @@ parameters:
type: string
description: the name/id of the VM flavor to be used by DACE VMs in the OpenStack instance where DACE is deployed
- dcae_base_environment:
- type: string
- description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
-
-
+# dcae_base_environment:
+# type: string
+# description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
dcae_zone:
type: string
description: DCAE Zone to use in VM names created by DCAE controller
- dcae_state:
- type: string
- description: DCAE State to use in VM names created by DCAE controller
+# dcae_state:
+# type: string
+# description: DCAE State to use in VM names created by DCAE controller
- nexus_repo_root:
- type: string
- description: Root URL of Nexus repository
+# nexus_repo_root:
+# type: string
+# description: Root URL of Nexus repository
- nexus_url_snapshot:
- type: string
- description: Snapshot of Maven repository for DCAE deployment
+# nexus_url_snapshot:
+# type: string
+# description: Snapshot of Maven repository for DCAE deployment
- openstack_region:
- type: string
- description: Region where the DCAE controller will spin the VMs
+# gitlab_branch:
+# type: string
+# description: Branch of the Gitlab repository
- gitlab_branch:
- type: string
- description: Branch of the Gitlab repository
-
- dcae_code_version:
- type: string
- description: DCAE Code Version Number
+# dcae_code_version:
+# type: string
+# description: DCAE Code Version Number
#####################
# #
@@ -454,19 +436,6 @@ resources:
public_key: { get_param: pub_key }
save_private_key: false
- # Public key used to access DCAE GEN 2
- dcae_vm_key:
- type: OS::Nova::KeyPair
- properties:
- name:
- str_replace:
- template: base_rand
- params:
- base: { get_param: dcae_key_name }
- rand: { get_resource: random-str }
- public_key: { get_param: dcae_pub_key }
- save_private_key: true
-
# ONAP management private network
oam_onap:
type: OS::Neutron::Net
@@ -1735,11 +1704,11 @@ resources:
image: { get_param: ubuntu_1604_image }
flavor: { get_param: flavor_medium }
name:
- str_replace:
+ str_replace:
template: base-dcae-bootstrap
params:
base: { get_param: vm_base_name }
- key_name: { get_resource: dcae_vm_key }
+ key_name: { get_resource: vm_key }
networks:
- port: { get_resource: dcae_c_private_port }
user_data_format: RAW