aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--blueprints/k8s-ves.yaml8
-rw-r--r--pom.xml2
-rwxr-xr-xscripts/bootstrap.sh1
-rw-r--r--version.properties2
4 files changed, 9 insertions, 4 deletions
diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml
index f122bae..9866e96 100644
--- a/blueprints/k8s-ves.yaml
+++ b/blueprints/k8s-ves.yaml
@@ -78,6 +78,11 @@ inputs:
type: integer
description: number of instances
default: 1
+ user_list:
+ type: string
+ description: List of user,password separated by pipe; pwd should be generated by using crypt-password tool (https://nexus.onap.org/#nexus-search;quick~crypt-password)
+ default: "sample1,$2a$10$0buh.2WeYwN868YMwnNNEuNEAMNYVU9.FSMJGyIKV3dGET/7oGOi6|demouser,$2a$10$1cc.COcqV/d3iT2N7BjPG.S6ZKv2jpb9a5MV.o7lMih/GpjJRX.Ce"
+
node_templates:
ves:
interfaces:
@@ -102,7 +107,8 @@ node_templates:
event.transform.flag: "0"
auth.method:
get_input: auth_method
- header.authlist: "sample1,$2a$10$0buh.2WeYwN868YMwnNNEuNEAMNYVU9.FSMJGyIKV3dGET/7oGOi6"
+ header.authlist:
+ get_input: user_list
services_calls: []
streams_publishes:
ves-fault:
diff --git a/pom.xml b/pom.xml
index 78ed460..6671e96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<groupId>org.onap.dcaegen2.deployments</groupId>
<artifactId>k8s-bootstrap-container</artifactId>
<name>dcaegen2-deployments-k8s-bootstrap-container</name>
- <version>1.12.3-SNAPSHOT</version>
+ <version>1.12.4-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<packaging>pom</packaging>
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 9fe7cd0..7fa339a 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -220,7 +220,6 @@ deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml
# tca, ves, prh, hv-ves, datafile-collector can be deployed simultaneously
deploy tca k8s-tca.yaml k8s-tca-inputs.yaml &
deploy tcagen2 k8s-tcagen2.yaml k8s-tcagen2-inputs.yaml &
-deploy ves k8s-ves.yaml k8s-ves-inputs.yaml &
deploy ves-tls k8s-ves.yaml k8s-ves-inputs-tls.yaml &
deploy prh k8s-prh.yaml k8s-prh-inputs.yaml &
deploy hv-ves k8s-hv-ves.yaml k8s-hv_ves-inputs.yaml &
diff --git a/version.properties b/version.properties
index b290fbe..cbfa5c8 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=1
minor=12
-patch=3
+patch=4
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT