diff options
3 files changed, 21 insertions, 6 deletions
diff --git a/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties b/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties index 30a04219..89fc6a3a 100644 --- a/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties +++ b/feature-distributed-locking/src/main/feature/config/feature-distributed-locking.properties @@ -1,8 +1,8 @@ ### # ============LICENSE_START======================================================= - # feature-distributed-locking + # ONAP # ================================================================================ -# Copyright (C) 2018-2019, 2021 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2018-2019, 2021-2022 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ #Database properties eclipselink.target-database=MySQL javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver -javax.persistence.jdbc.url=jdbc:mariadb://${envd:SQL_HOST}:${envd:SQL_PORT:3306}/pooling +javax.persistence.jdbc.url=${envd:JDBC_URL}pooling${envd:JDBC_OPTS} javax.persistence.jdbc.user=${envd:SQL_USER} javax.persistence.jdbc.password=${envd:SQL_PASSWORD} diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf index aac21256..86eb934e 100644 --- a/packages/install/src/files/base.conf +++ b/packages/install/src/files/base.conf @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2022 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2020 Bell Canada. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -69,11 +69,21 @@ REPOSITORY_OFFLINE= # Relational (SQL) DB access +# override the mysql tool command in tooling with custom parameters +MYSQL_CMD=mysql + +# mandatory parameters for the DB server location SQL_HOST= SQL_USER= SQL_PASSWORD= SQL_PORT=3306 +# override the JDBC urls to support customizations +JDBC_URL= + +# add optional JDBC options for the connector to use +JDBC_OPTS= + # AAF AAF=false diff --git a/policy-management/src/main/server-gen/bin/db-migrator b/policy-management/src/main/server-gen/bin/db-migrator index b4602ea8..64d0fcf1 100644 --- a/policy-management/src/main/server-gen/bin/db-migrator +++ b/policy-management/src/main/server-gen/bin/db-migrator @@ -3,7 +3,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2022 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -530,7 +530,12 @@ if [ -z "${SQL_PORT}" ]; then export SQL_PORT=3306 fi -MYSQL="mysql -u${SQL_USER} -p${SQL_PASSWORD} -h ${SQL_HOST} -P ${SQL_PORT}" +if [ -z "$MYSQL_CMD" ]; then + MYSQL_CMD="mysql" +fi + +MYSQL="${MYSQL_CMD} -u${SQL_USER} -p${SQL_PASSWORD} -h ${SQL_HOST} -P ${SQL_PORT}" + if ! ${MYSQL} --execute "show databases;" > /dev/null 2>&1; then echo "error: No DB connectivity to ${SQL_HOST} for ${SQL_USER}" exit 5 |