diff options
Diffstat (limited to 'kubernetes/sdnc')
| -rwxr-xr-x | kubernetes/sdnc/resources/config/bin/startODL.sh | 9 | ||||
| -rw-r--r-- | kubernetes/sdnc/templates/statefulset.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdnc/values.yaml | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh index af5c36207c..6aa796a163 100755 --- a/kubernetes/sdnc/resources/config/bin/startODL.sh +++ b/kubernetes/sdnc/resources/config/bin/startODL.sh @@ -4,6 +4,7 @@ # ============LICENSE_START======================================================= # SDNC # ================================================================================ +# Copyright © 2020 Samsung Electronics # Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -133,17 +134,17 @@ echo " AAF_ENABLED=$SDNC_AAF_ENABLED" if $SDNC_AAF_ENABLED; then - export SDNC_STORE_DIR=/opt/app/osaaf/local - export SDNC_CONFIG_DIR=/opt/app/osaaf/local + export SDNC_AAF_STORE_DIR=/opt/app/osaaf/local + export SDNC_AAF_CONFIG_DIR=/opt/app/osaaf/local export SDNC_KEYPASS=`cat /opt/app/osaaf/local/.pass` export SDNC_KEYSTORE=org.onap.sdnc.p12 sed -i '/cadi_prop_files/d' $ODL_HOME/etc/system.properties - echo "cadi_prop_files=$SDNC_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc/system.properties + echo "cadi_prop_files=$SDNC_AAF_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc/system.properties sed -i '/org.ops4j.pax.web.ssl.keystore/d' $ODL_HOME/etc/custom.properties sed -i '/org.ops4j.pax.web.ssl.password/d' $ODL_HOME/etc/custom.properties sed -i '/org.ops4j.pax.web.ssl.keypassword/d' $ODL_HOME/etc/custom.properties - echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_HOME/etc/custom.properties + echo org.ops4j.pax.web.ssl.keystore=$SDNC_AAF_STORE_DIR/$SDNC_KEYSTORE >> $ODL_HOME/etc/custom.properties echo org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties fi diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index da5d8f30d4..4511ca9125 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -1,4 +1,5 @@ {{/* +# Copyright © 2020 Samsung Electronics # Copyright © 2017 Amdocs, Bell Canada # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -208,6 +209,9 @@ spec: - mountPath: {{ .Values.config.binDir }}/installSdncDb.sh name: bin subPath: installSdncDb.sh + - mountPath: {{ .Values.config.ccsdkConfigDir }}/aaiclient.properties + name: properties + subPath: aaiclient.properties - mountPath: {{ .Values.config.configDir }}/aaiclient.properties name: properties subPath: aaiclient.properties diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 8cb7c339c7..99ff4b7760 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -1,3 +1,4 @@ +# Copyright © 2020 Samsung Electronics # Copyright © 2017 Amdocs, Bell Canada # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -159,6 +160,7 @@ config: peerODLCluster: 127.0.0.1 isPrimaryCluster: true configDir: /opt/onap/sdnc/data/properties + ccsdkConfigDir: /opt/onap/ccsdk/data/properties dmaapTopic: SUCCESS dmaapPort: 3904 logstashServiceName: log-ls |