diff options
author | Marco Platania <platania@research.att.com> | 2019-02-01 09:07:44 -0500 |
---|---|---|
committer | Marco Platania <platania@research.att.com> | 2019-02-01 09:09:17 -0500 |
commit | c048ccdceeced7f58f685c37a77b835d0e9bc16a (patch) | |
tree | 3522bbb1a52bdb3aca8923cde77d1c711df4cec3 /heat/vFWCL | |
parent | c7022a1a9b26b5a9fe9729faf827d6f04de8be01 (diff) |
Bump demo artifact version
- Change demo artifact v. to 1.4.0-SNAPSHOT
- Change VES collector port number
- Remove comments from Heat templates
Change-Id: Ia1428d7fcc4740702488c0b28bdb5b3b0e31fd8d
Issue-ID: INT-658
Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'heat/vFWCL')
-rw-r--r-- | heat/vFWCL/vFWSNK/base_vfw.env | 6 | ||||
-rw-r--r-- | heat/vFWCL/vFWSNK/base_vfw.yaml | 1 | ||||
-rw-r--r-- | heat/vFWCL/vPKG/base_vpkg.env | 4 | ||||
-rw-r--r-- | heat/vFWCL/vPKG/base_vpkg.yaml | 3 |
4 files changed, 6 insertions, 8 deletions
diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env index 8b89f2c2..6b7e334c 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.env +++ b/heat/vFWCL/vFWSNK/base_vfw.env @@ -43,9 +43,9 @@ parameters: # APP/USER_DATA dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 8081 - demo_artifacts_version: 1.3.0-SNAPSHOT - install_script_version: 1.3.0-SNAPSHOT + dcae_collector_port: 30235 + demo_artifacts_version: 1.4.0-SNAPSHOT + install_script_version: 1.4.0-SNAPSHOT key_name: vfw_key pub_key: PUT YOUR KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml index 6ecae84b..fe7d96cd 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.yaml +++ b/heat/vFWCL/vFWSNK/base_vfw.yaml @@ -160,7 +160,6 @@ parameters: nexus_artifact_repo: type: string description: Root URL for the Nexus repository for Maven artifacts. - #default: "https://nexus.onap.org" cloud_env: type: string label: Cloud environment diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env index 6a1b33e3..72396cec 100644 --- a/heat/vFWCL/vPKG/base_vpkg.env +++ b/heat/vFWCL/vPKG/base_vpkg.env @@ -31,8 +31,8 @@ parameters: # APP/USER_DATA vfw_private_ip_0: 192.168.10.100 vsn_private_ip_0: 192.168.20.250 - demo_artifacts_version: 1.3.0-SNAPSHOT - install_script_version: 1.3.0-SNAPSHOT + demo_artifacts_version: 1.4.0-SNAPSHOT + install_script_version: 1.4.0-SNAPSHOT key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWCL/vPKG/base_vpkg.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml index 7efb2e9c..70c5e017 100644 --- a/heat/vFWCL/vPKG/base_vpkg.yaml +++ b/heat/vFWCL/vPKG/base_vpkg.yaml @@ -124,7 +124,6 @@ parameters: nexus_artifact_repo: type: string description: Root URL for the Nexus repository for Maven artifacts. - #default: "https://nexus.onap.org" cloud_env: type: string label: Cloud environment @@ -187,7 +186,7 @@ resources: - network: { get_param: public_net_id } - port: { get_resource: vpg_0_unprotected_private_port_0 } - port: { get_resource: vpg_0_onap_private_port_0 } - metadata: + metadata: vnf_name: { get_param: vnf_name } vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } |