summaryrefslogtreecommitdiffstats
path: root/dpo
diff options
context:
space:
mode:
Diffstat (limited to 'dpo')
-rw-r--r--dpo/blueprint/blueprint_ves.yaml2
-rw-r--r--dpo/spec/vescollector-componentspec.json16
-rw-r--r--dpo/tosca_model/schema.yaml2
-rw-r--r--dpo/tosca_model/template.yaml2
-rw-r--r--dpo/tosca_model/translate.yaml6
5 files changed, 10 insertions, 18 deletions
diff --git a/dpo/blueprint/blueprint_ves.yaml b/dpo/blueprint/blueprint_ves.yaml
index 3785593b..2dbc5a66 100644
--- a/dpo/blueprint/blueprint_ves.yaml
+++ b/dpo/blueprint/blueprint_ves.yaml
@@ -100,7 +100,7 @@ node_templates:
collector.service.secure.port: -1
tomcat.maxthreads: '200'
collector.keystore.file.location: "/opt/app/dcae-certificate/keystore.jks"
- header.authflag: 0
+ auth.method: "noAuth"
collector.service.port: 8080
streams_publishes:
sec_fault_unsecure:
diff --git a/dpo/spec/vescollector-componentspec.json b/dpo/spec/vescollector-componentspec.json
index 9e29c2cd..4e2eb970 100644
--- a/dpo/spec/vescollector-componentspec.json
+++ b/dpo/spec/vescollector-componentspec.json
@@ -234,8 +234,8 @@
"parameters": [
{
"name": "collector.service.port",
- "value": -1,
- "description": "standard http port collector will open for listening; this will be disabled when header.authflag is set to 1",
+ "value": 8080,
+ "description": "standard http port collector will open for listening;",
"sourced_at_deployment": false,
"policy_editable": false,
"designer_editable": false
@@ -249,14 +249,6 @@
"designer_editable": true
},
{
- "name": "collector.service.secure.clientauth",
- "value": 0,
- "description": "Mutual TLS authentication flag; enables an authentication of the client to the server",
- "sourced_at_deployment": false,
- "policy_editable": false,
- "designer_editable": false
- },
- {
"name": "collector.keystore.file.location",
"value": "/opt/app/dcae-certificate/keystore.jks",
"description": "fs location of keystore file in vm",
@@ -305,8 +297,8 @@
"designer_editable": false
},
{
- "name": "header.authflag",
- "value": 1,
+ "name": "auth.method",
+ "value": "noAuth",
"description": "Basic Authentication flag; when enabled only secure port will be supported.",
"sourced_at_deployment": false,
"policy_editable": false,
diff --git a/dpo/tosca_model/schema.yaml b/dpo/tosca_model/schema.yaml
index 6182761b..6c1b2757 100644
--- a/dpo/tosca_model/schema.yaml
+++ b/dpo/tosca_model/schema.yaml
@@ -209,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 ce0da721..73b4ad38 100644
--- a/dpo/tosca_model/template.yaml
+++ b/dpo/tosca_model/template.yaml
@@ -33,7 +33,7 @@ topology_template:
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 2de809b6..284f34bf 100644
--- a/dpo/tosca_model/translate.yaml
+++ b/dpo/tosca_model/translate.yaml
@@ -38,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
@@ -119,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: