diff options
| author |   Marco Platania <platania@research.att.com> | 2017-10-23 10:26:16 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2017-10-23 14:30:03 +0000 |
| commit | a77e47fe73a8eaa373cf877e0640bb8835c1f7e3 (patch) | |
| tree | b9bf776b1cb69b950570c0d2117cb4b0d1eaf113 /heat/ONAP/onap_openstack.env | |
| parent | 8ddf3e163f1931907e20addb60a4c9af21e5e9c5 (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/ONAP/onap_openstack.env')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 30 |
1 files changed, 11 insertions, 19 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 |