Due to changes between java 11.0.5 and 11.0.6 older way of generating ca certs is incorrect
New hv-ves image is compatible with new cfy k8s plugin (v 1.6.0).
Because of that cert path need to be changed.
Change-Id: If432b9b57c33caff1738500a9aa486293ba3a024
Issue-ID: DCAEGEN2-2013
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
"server.maxPayloadSizeBytes": 1048576,
"cbs.firstRequestDelaySec": 3,
"cbs.requestIntervalSec": 5,
"server.maxPayloadSizeBytes": 1048576,
"cbs.firstRequestDelaySec": 3,
"cbs.requestIntervalSec": 5,
- "security.keys.keyStoreFile": "/etc/hv-ves/ssl/server.p12",
- "security.keys.keyStorePasswordFile": "/etc/hv-ves/ssl/server.pass",
- "security.keys.trustStoreFile": "/etc/hv-ves/ssl/trust.p12",
- "security.keys.trustStorePasswordFile": "/etc/hv-ves/ssl/trust.pass"
+ "security.keys.keyStoreFile": "/etc/ves-hv/ssl/server.p12",
+ "security.keys.keyStorePasswordFile": "/etc/ves-hv/ssl/server.pass",
+ "security.keys.trustStoreFile": "/etc/ves-hv/ssl/trust.p12",
+ "security.keys.trustStorePasswordFile": "/etc/ves-hv/ssl/trust.pass"
}
\ No newline at end of file
}
\ No newline at end of file
function gen_ca() {
local ca="$1"
function gen_ca() {
local ca="$1"
- keytool -genkeypair ${store_opts} -alias ${ca} -dname "${DNAME_PREFIX}-${ca}" -keystore ${ca}.p12
+ keytool -genkeypair ${store_opts} -alias ${ca} -dname "${DNAME_PREFIX}-${ca}" -keystore ${ca}.p12 -ext bc:c
keytool -export -alias ${ca} -file ${ca}.crt ${store_opts} -keystore ${ca}.p12
}
keytool -export -alias ${ca} -file ${ca}.crt ${store_opts} -keystore ${ca}.p12
}
ports:
- "6060:6060"
- "6061:6061/tcp"
ports:
- "6060:6060"
- "6061:6061/tcp"
- command: ["--configuration-file", "/etc/hv-ves/configuration/secure.json"]
+ command: ["--configuration-file", "/etc/ves-hv/configuration/secure.json"]
environment:
- JAVA_OPTS
- HOSTNAME=${HV_VES_HOSTNAME}
environment:
- JAVA_OPTS
- HOSTNAME=${HV_VES_HOSTNAME}
retries: 2
test: ${HV_VES_HEALTHCHECK_CMD}
volumes:
retries: 2
test: ${HV_VES_HEALTHCHECK_CMD}
volumes:
- - ./collector/:/etc/hv-ves/
+ - ./collector/:/etc/ves-hv/
depends_on:
- config-binding-service
- kafka
depends_on:
- config-binding-service
- kafka
ports:
- "7060:6060"
- "7061:6061/tcp"
ports:
- "7060:6060"
- "7061:6061/tcp"
- command: ["--configuration-file", "/etc/hv-ves/configuration/insecure.json"]
+ command: ["--configuration-file", "/etc/ves-hv/configuration/insecure.json"]
environment:
- JAVA_OPTS
- HOSTNAME=${HV_VES_HOSTNAME}
environment:
- JAVA_OPTS
- HOSTNAME=${HV_VES_HOSTNAME}
retries: 2
test: ${HV_VES_HEALTHCHECK_CMD}
volumes:
retries: 2
test: ${HV_VES_HEALTHCHECK_CMD}
volumes:
- - ./collector/:/etc/hv-ves/
+ - ./collector/:/etc/ves-hv/
depends_on:
- config-binding-service
- kafka
depends_on:
- config-binding-service
- kafka
export JAVA_OPTS="-Dio.netty.leakDetection.level=paranoid"
export CONSUL_HOST="consul-server"
export CONFIG_BINDING_SERVICE="config-binding-service"
export JAVA_OPTS="-Dio.netty.leakDetection.level=paranoid"
export CONSUL_HOST="consul-server"
export CONFIG_BINDING_SERVICE="config-binding-service"
+export CONFIG_BINDING_SERVICE_SERVICE_PORT="10000"
export ONAP_NEXUS_REGISTRY="nexus3.onap.org:10001"
export ONAP_NEXUS_REGISTRY="nexus3.onap.org:10001"
-export DOCKER_REGISTRY="docker.io"
-export DOCKER_REGISTRY_PREFIX=""
+export DOCKER_REGISTRY=${ONAP_NEXUS_REGISTRY}
+export DOCKER_REGISTRY_PREFIX="${DOCKER_REGISTRY}/"
export KAFKA_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/kafka111:0.0.6"
export ZOOKEEPER_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/zookeeper:4.0.0"
export KAFKA_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/kafka111:0.0.6"
export ZOOKEEPER_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/zookeeper:4.0.0"