diff options
| author |   Tony Hansen <tony@att.com> | 2017-10-26 12:14:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-26 12:14:59 +0000 |
| commit | 59e51d37bf3fb72413fe395b117c415f3cea671f (patch) | |
| tree | 57139a5d7f6ceb826a788b169ff398658e2bf19c | |
| parent | 9a3daed8316f7c455b53250217d36172593236a4 (diff) | |
| parent | 3e8e8f7d77349386f02c86f4cc3118061561ac0d (diff) | |
Merge "ves blueprint update for port mapping"
| -rw-r--r-- | blueprints/ves.yaml-template | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/blueprints/ves.yaml-template b/blueprints/ves.yaml-template index a09c119..0a94e5b 100644 --- a/blueprints/ves.yaml-template +++ b/blueprints/ves.yaml-template @@ -8,9 +8,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,7 @@ tosca_definitions_version: cloudify_dsl_1_3 -imports: +imports: - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml" - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/dockerplugin/2/dockerplugin_types.yaml" - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationshipplugin/1/relationshipplugin_types.yaml" @@ -40,22 +40,26 @@ inputs: type: string default: "zone1" -node_templates: - docker_host_host: - properties: - docker_host_override: +node_templates: + docker_collector_host: + properties: + docker_host_override: get_input: dh_override - location_id: + location_id: get_input: dh_location_id type: dcae.nodes.SelectedDockerHost - ves_ves: - interfaces: - cloudify.interfaces.lifecycle: - stop: - inputs: + ves: + interfaces: + cloudify.interfaces.lifecycle: + stop: + inputs: cleanup_image: true - properties: - application_config: + start: + inputs: + ports: + - '8080:8080' + properties: + application_config: collector.dmaap.streamid: fault=ves_fault|syslog=ves_syslog|heartbeat=ves_heartbeat|measurementsForVfScaling=ves_measurement|mobileFlow=ves_mobileflow|other=ves_other|stateChange=ves_statechange|thresholdCrossingAlert=ves_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling collector.inputQueue.maxPending: "8096" collector.keystore.alias: "dynamically generated" @@ -69,28 +73,27 @@ node_templates: header.authflag: "0" header.authlist: "userid1,base64encodepwd1|userid2,base64encodepwd2" services_calls: [] - streams_publishes: - ves_fault: - dmaap_info: - topic_url: + streams_publishes: + ves_fault: + dmaap_info: + topic_url: get_input: ves_fault_publish_url type: message_router - ves_measurement: - dmaap_info: + ves_measurement: + dmaap_info: topic_url: get_input: ves_measurement_publish_url type: message_router tomcat.maxthreads: "200" - docker_config: - healthcheck: + docker_config: + healthcheck: endpoint: /healthcheck interval: 15s timeout: 1s type: http - image: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.1-latest" + image: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.1-latest" service_component_type: dcaegen2-collectors-ves relationships: - type: dcae.relationships.component_contained_in - target: docker_host_host + target: docker_collector_host type: dcae.nodes.DockerContainerForComponentsUsingDmaap - |