diff options
Diffstat (limited to 'dpo/tosca_model')
| -rw-r--r-- | dpo/tosca_model/schema.yaml | 4 | ||||
| -rw-r--r-- | dpo/tosca_model/template.yaml | 3 | ||||
| -rw-r--r-- | dpo/tosca_model/translate.yaml | 10 |
3 files changed, 5 insertions, 12 deletions
diff --git a/dpo/tosca_model/schema.yaml b/dpo/tosca_model/schema.yaml index d8b16765..6c1b2757 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: @@ -211,7 +209,7 @@ node_types: type: string docker_collector.service.secure.port: type: string - docker_header.authflag: + docker_auth.method: type: string docker_header.authlist: type: string diff --git a/dpo/tosca_model/template.yaml b/dpo/tosca_model/template.yaml index b439fd18..73b4ad38 100644 --- a/dpo/tosca_model/template.yaml +++ b/dpo/tosca_model/template.yaml @@ -27,14 +27,13 @@ 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' docker_collector.schema.file: ./etc/CommonEventFormat_27.2.json docker_collector.service.port: '8080' docker_collector.service.secure.port: '-1' - docker_header.authflag: '0' + docker_auth.method: noAuth docker_header.authlist: userid1,base64encodepwd1|userid2,base64encodepwd2 docker_tomcat.maxthreads: '200' location_id: diff --git a/dpo/tosca_model/translate.yaml b/dpo/tosca_model/translate.yaml index efda8a54..284f34bf 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: @@ -40,7 +38,7 @@ topology_template: type: string docker_collector.service.secure.port: type: string - docker_header.authflag: + docker_auth.method: type: string docker_header.authlist: type: string @@ -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: @@ -123,8 +119,8 @@ topology_template: get_input: docker_collector.service.port collector.service.secure.port: get_input: docker_collector.service.secure.port - header.authflag: - get_input: docker_header.authflag + auth.method: + get_input: docker_auth.method header.authlist: get_input: docker_header.authlist tomcat.maxthreads: |