diff options
| author |   Hector Anapan <ha076r@att.com> | 2017-08-16 14:56:54 -0400 |
|---|---|---|
| committer |   Patrick Brady <pb071s@att.com> | 2017-08-16 22:09:46 +0000 |
| commit | 249b2c06fb63e42efcfbb1a2c60004789b4f9c8d (patch) | |
| tree | 7ec8de25a27070257e366500cad4654c7dcc72a5 /platform-logic | |
| parent | dfdf6d89e3efe5b4244584909e51c039750ef5ee (diff) | |
Changing AAIService Bundle to use AAI Properties
This code changes the docker-compose.yml's SDNC_CONFIG_DIR env.variable in the "appc" service that deploys the appc container to point to appc's aaiclient.properties instead of the sdnc's aiiclient.properties. In doing so, some properties had to be moved to the new SDNC_CONFIG_DIR's appc properties folder path so SDNC karaf features are installed correctly. Also, replacing the AAIClient p12 keystore by converting the validated jks file to this new p12 keystore certificate.
Change-Id: I6ee5bd56f4403cb575fdc93ded8eebc6a7a5cc4b
Signed-off-by: Hector Anapan <ha076r@att.com>
Issue: [APPC-129]
Diffstat (limited to 'platform-logic')
| -rw-r--r-- | platform-logic/installer/src/main/scripts/setenv.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/platform-logic/installer/src/main/scripts/setenv.sh b/platform-logic/installer/src/main/scripts/setenv.sh index 5484048..fbbdefa 100644 --- a/platform-logic/installer/src/main/scripts/setenv.sh +++ b/platform-logic/installer/src/main/scripts/setenv.sh @@ -21,15 +21,18 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. ### -SDNC_CONFIG_DIR=${SDNC_CONFIG_DIR:-/opt/sdnc/data/properties} +# Tweaking SDNC_CONFIG_DIR temporarily from ../sdnc/.. to ../appc/.. since it may be needed in this script +# to map to SDN-C AAI Service Bundle's AAI Activator class inside the gerrit sdnc/adaptors repo, so that +# the AAI Service bundle loads APP-C's aaiclient.properties instead of SDN-C's aaiclient.properties. +SDNC_CONFIG_DIR=${SDNC_CONFIG_DIR:-/opt/appc/data/properties} APPC_CONFIG_DIR=${APPC_CONFIG_DIR:-/opt/appc/data/properties} -AAIURI=$(grep org.openecomp.sdnc.sli.aai.uri ${APPC_CONFIG_DIR}/aaiclient.properties | grep -v '#' | cut -d'=' -f2) +AAIURI=$(grep org.openecomp.sdnc.sli.aai.uri ${SDNC_CONFIG_DIR}/aaiclient.properties | grep -v '#' | cut -d'=' -f2) -MYSQL_USER=$(grep org.openecomp.sdnc.sli.jdbc.user ${APPC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) -MYSQL_PWD=$(grep org.openecomp.sdnc.sli.jdbc.password ${APPC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) -MYSQL_DB=$(grep org.openecomp.sdnc.sli.jdbc.database ${APPCC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) -MYSQL_SERVER=$(grep org.openecomp.sdnc.sli.jdbc.hosts ${APPC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2 | cut -d',' -f1) +MYSQL_USER=$(grep org.openecomp.sdnc.sli.jdbc.user ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) +MYSQL_PWD=$(grep org.openecomp.sdnc.sli.jdbc.password ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) +MYSQL_DB=$(grep org.openecomp.sdnc.sli.jdbc.database ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2) +MYSQL_SERVER=$(grep org.openecomp.sdnc.sli.jdbc.hosts ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2 | cut -d',' -f1) ODLUSER=$(grep controllerUser ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2) ODLPWD=$(grep controllerPass ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2) |