diff options
| -rw-r--r-- | docker-compose/docker-compose.yml | 4 | ||||
| -rw-r--r-- | installation/appc/src/main/scripts/installAppcDb.sh | 2 | ||||
| -rw-r--r-- | installation/src/main/properties/dblib.properties | 28 | ||||
| -rw-r--r-- | installation/src/main/properties/mdsal-resource.properties | 10 | ||||
| -rw-r--r-- | installation/src/main/properties/svclogic.properties | 12 |
5 files changed, 28 insertions, 28 deletions
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index e89f425..f95a5fe 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -57,7 +57,7 @@ services: entrypoint: - "/bin/bash" - "-c" - - "cd /opt/openecomp/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait" + - "cd /opt/onap/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait" ports: - "3000:3100" links: @@ -67,7 +67,7 @@ services: - appc:sdnhost environment: - MYSQL_ROOT_PASSWORD=openECOMP1.0 - - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties + - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties logging: driver: "json-file" options: diff --git a/installation/appc/src/main/scripts/installAppcDb.sh b/installation/appc/src/main/scripts/installAppcDb.sh index bd9b893..fcbf010 100644 --- a/installation/appc/src/main/scripts/installAppcDb.sh +++ b/installation/appc/src/main/scripts/installAppcDb.sh @@ -18,7 +18,7 @@ # ============LICENSE_END========================================================= ### -SDNC_HOME=${SDNC_HOME:-/opt/openecomp/sdnc} +SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} APPC_HOME=${APPC_HOME:-/opt/openecomp/appc} MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} diff --git a/installation/src/main/properties/dblib.properties b/installation/src/main/properties/dblib.properties index 1523a37..9598f11 100644 --- a/installation/src/main/properties/dblib.properties +++ b/installation/src/main/properties/dblib.properties @@ -18,19 +18,19 @@ # ============LICENSE_END========================================================= ### -# dblib.properties -org.openecomp.sdnc.sli.dbtype=jdbc +# dblib.properrties +org.onap.ccsdk.sli.dbtype=jdbc -org.openecomp.sdnc.sli.jdbc.hosts=sdnctldb01 -org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl -org.openecomp.sdnc.sli.jdbc.database=sdnctl -org.openecomp.sdnc.sli.jdbc.user=sdnctl -org.openecomp.sdnc.sli.jdbc.password=gamma -org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01 -org.openecomp.sdnc.sli.jdbc.connection.timeout=50 -org.openecomp.sdnc.sli.jdbc.request.timeout=100 -org.openecomp.sdnc.sli.jdbc.limit.init=10 -org.openecomp.sdnc.sli.jdbc.limit.min=10 -org.openecomp.sdnc.sli.jdbc.limit.max=20 -org.openecomp.dblib.connection.recovery=false +org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01 +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl +org.onap.ccsdk.sli.jdbc.database=sdnctl +org.onap.ccsdk.sli.jdbc.user=sdnctl +org.onap.ccsdk.sli.jdbc.password=gamma +org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01 +org.onap.ccsdk.sli.jdbc.connection.timeout=50 +org.onap.ccsdk.sli.jdbc.request.timeout=100 +org.onap.ccsdk.sli.jdbc.limit.init=10 +org.onap.ccsdk.sli.jdbc.limit.min=10 +org.onap.ccsdk.sli.jdbc.limit.max=20 +org.onap.dblib.connection.recovery=false diff --git a/installation/src/main/properties/mdsal-resource.properties b/installation/src/main/properties/mdsal-resource.properties index 7f015f4..7ad29fb 100644 --- a/installation/src/main/properties/mdsal-resource.properties +++ b/installation/src/main/properties/mdsal-resource.properties @@ -18,8 +18,8 @@ # ============LICENSE_END========================================================= ### -org.openecomp.sdnc.sli.resource.mdsal.sdnc-user=admin -org.openecomp.sdnc.sli.resource.mdsal.sdnc-passwd=admin -org.openecomp.sdnc.sli.resource.mdsal.sdnc-host=localhost -org.openecomp.sdnc.sli.resource.mdsal.sdnc-protocol=http -org.openecomp.sdnc.sli.resource.mdsal.sdnc-port=8181 +org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-user=admin +org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-passwd=admin +org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-host=localhost +org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-protocol=http +org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-port=8181 diff --git a/installation/src/main/properties/svclogic.properties b/installation/src/main/properties/svclogic.properties index 83ebae9..7900843 100644 --- a/installation/src/main/properties/svclogic.properties +++ b/installation/src/main/properties/svclogic.properties @@ -18,11 +18,11 @@ # ============LICENSE_END========================================================= ### -org.openecomp.sdnc.sli.dbtype = dblib -#Note : the next 4 fields are only used if org.openecomp.sdnc.sli.dbtype = jdbc -org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl -org.openecomp.sdnc.sli.jdbc.database=sdnctl -org.openecomp.sdnc.sli.jdbc.user=sdnctl -org.openecomp.sdnc.sli.jdbc.password=gamma +org.onap.ccsdk.sli.dbtype = dblib +#Note : the next 4 fields are only used if org.onap.ccsdk.sli.dbtype = jdbc +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl +org.onap.ccsdk.sli.jdbc.database=sdnctl +org.onap.ccsdk.sli.jdbc.user=sdnctl +org.onap.ccsdk.sli.jdbc.password=gamma org.xml.sax.driver=org.apache.xerces.parsers.SAXParser |