aboutsummaryrefslogtreecommitdiffstats
path: root/dpo
diff options
context:
space:
mode:
authorZlatko Murgoski <zlatko.murgoski@nokia.com>2019-03-04 12:17:13 +0100
committerZlatko Murgoski <zlatko.murgoski@nokia.com>2019-03-04 14:13:27 +0100
commita47dfe2aa2173ae87a8d79141743fc062019117b (patch)
tree1c71eada59fe44362ef6abbfecd0a05543d7f7f6 /dpo
parent01cf3b35295bfee2c9b27d97d1c6a53f6872a350 (diff)
Remove alias property
Remove unused alias property Issue-ID: DCAEGEN2-1104 Change-Id: Ib843a624e36b99057bf66f5b1ec72d4b498e4481 Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
Diffstat (limited to 'dpo')
-rw-r--r--dpo/blueprint/blueprint_ves.yaml1
-rw-r--r--dpo/spec/vescollector-componentspec.json30
-rw-r--r--dpo/tosca_model/schema.yaml2
-rw-r--r--dpo/tosca_model/template.yaml1
-rw-r--r--dpo/tosca_model/translate.yaml4
5 files changed, 11 insertions, 27 deletions
diff --git a/dpo/blueprint/blueprint_ves.yaml b/dpo/blueprint/blueprint_ves.yaml
index 3bf50f70..7163766c 100644
--- a/dpo/blueprint/blueprint_ves.yaml
+++ b/dpo/blueprint/blueprint_ves.yaml
@@ -130,7 +130,6 @@ node_templates:
streams_subscribes: {}
collector.inputQueue.maxPending: 8096
collector.schema.file: "./etc/CommonEventFormat_27.2.json"
- collector.keystore.alias: dynamically generated
image:
NEXUS_REPO_HOST:18443/dcae-dev-raw/dcae-controller-ves-collector:1.1.3
docker_config:
diff --git a/dpo/spec/vescollector-componentspec.json b/dpo/spec/vescollector-componentspec.json
index 1b407b14..e5d59834 100644
--- a/dpo/spec/vescollector-componentspec.json
+++ b/dpo/spec/vescollector-componentspec.json
@@ -273,29 +273,21 @@
"designer_editable": false
},
{
- "name": "collector.keystore.alias",
- "value": "dynamically generated",
- "description": "alias to access the keystore; collector will identify this based on keystore and password file",
+ "name": "collector.truststore.file.location",
+ "value": "/opt/app/dcae-certificate/truststore.jks",
+ "description": "fs location of truststore file in vm",
+ "sourced_at_deployment": false,
+ "policy_editable": false,
+ "designer_editable": false
+ },
+ {
+ "name": "collector.truststore.passwordfile",
+ "value": "/opt/app/dcae-certificate/.trustpassword",
+ "description": "location of truststore password file in vm",
"sourced_at_deployment": false,
"policy_editable": false,
"designer_editable": false
},
- {
- "name": "collector.truststore.file.location",
- "value": "/opt/app/dcae-certificate/truststore.jks",
- "description": "fs location of truststore file in vm",
- "sourced_at_deployment": false,
- "policy_editable": false,
- "designer_editable": false
- },
- {
- "name": "collector.truststore.passwordfile",
- "value": "/opt/app/dcae-certificate/.trustpassword",
- "description": "location of truststore password file in vm",
- "sourced_at_deployment": false,
- "policy_editable": false,
- "designer_editable": false
- },
{
"name": "collector.inputQueue.maxPending",
"value": 8096,
diff --git a/dpo/tosca_model/schema.yaml b/dpo/tosca_model/schema.yaml
index d8b16765..6182761b 100644
--- a/dpo/tosca_model/schema.yaml
+++ b/dpo/tosca_model/schema.yaml
@@ -197,8 +197,6 @@ node_types:
type: string
docker_collector.inputQueue.maxPending:
type: string
- docker_collector.keystore.alias:
- type: string
docker_collector.keystore.file.location:
type: string
docker_collector.keystore.passwordfile:
diff --git a/dpo/tosca_model/template.yaml b/dpo/tosca_model/template.yaml
index b439fd18..ce0da721 100644
--- a/dpo/tosca_model/template.yaml
+++ b/dpo/tosca_model/template.yaml
@@ -27,7 +27,6 @@ topology_template:
properties:
docker_collector.dmaap.streamid: fault=sec_fault,roadm-sec-to-hp|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert
docker_collector.inputQueue.maxPending: '8096'
- docker_collector.keystore.alias: dynamically generated
docker_collector.keystore.file.location: /opt/app/dcae-certificate/keystore.jks
docker_collector.keystore.passwordfile: /opt/app/dcae-certificate/.password
docker_collector.schema.checkflag: '1'
diff --git a/dpo/tosca_model/translate.yaml b/dpo/tosca_model/translate.yaml
index efda8a54..2de809b6 100644
--- a/dpo/tosca_model/translate.yaml
+++ b/dpo/tosca_model/translate.yaml
@@ -26,8 +26,6 @@ topology_template:
type: string
docker_collector.inputQueue.maxPending:
type: string
- docker_collector.keystore.alias:
- type: string
docker_collector.keystore.file.location:
type: string
docker_collector.keystore.passwordfile:
@@ -109,8 +107,6 @@ topology_template:
get_input: docker_collector.dmaap.streamid
collector.inputQueue.maxPending:
get_input: docker_collector.inputQueue.maxPending
- collector.keystore.alias:
- get_input: docker_collector.keystore.alias
collector.keystore.file.location:
get_input: docker_collector.keystore.file.location
collector.keystore.passwordfile: