diff options
26 files changed, 158 insertions, 111 deletions
diff --git a/data-migrator/pom.xml b/data-migrator/pom.xml index 5c1922ef..48b1a0de 100644 --- a/data-migrator/pom.xml +++ b/data-migrator/pom.xml @@ -68,6 +68,11 @@ <version>2.18.0</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>utils-provider</artifactId> + <version>${ccsdk.sli.version}</version> + </dependency> </dependencies> <build> diff --git a/data-migrator/src/main/java/org/onap/sdnc/oam/datamigrator/common/MigratorConfiguration.java b/data-migrator/src/main/java/org/onap/sdnc/oam/datamigrator/common/MigratorConfiguration.java index 40a1b920..9c3f7ac9 100644 --- a/data-migrator/src/main/java/org/onap/sdnc/oam/datamigrator/common/MigratorConfiguration.java +++ b/data-migrator/src/main/java/org/onap/sdnc/oam/datamigrator/common/MigratorConfiguration.java @@ -19,6 +19,7 @@ */ package org.onap.sdnc.oam.datamigrator.common; +import org.onap.ccsdk.sli.core.utils.common.EnvProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,7 +74,7 @@ public class MigratorConfiguration { + propFile); } - Properties props = new Properties(); + Properties props = new EnvProperties(); props.load(new FileInputStream(propFile)); this.sourceHost = props.getProperty("org.onap.sdnc.datamigrator.source.host"); this.sourceUser = props.getProperty("org.onap.sdnc.datamigrator.source.user"); diff --git a/installation/dmaap-listener/src/main/properties/aai.properties b/installation/dmaap-listener/src/main/properties/aai.properties index 186efa99..4f6bd5c8 100755 --- a/installation/dmaap-listener/src/main/properties/aai.properties +++ b/installation/dmaap-listener/src/main/properties/aai.properties @@ -9,10 +9,10 @@ routeOffer=MR1 SubContextPath =/ Protocol =http MethodType =GET -username =admin -password =admin +username =${DMAAP_USER} +password =${DMAAP_PASSWORD} contenttype =application/json -authKey=fxoW4jZrO7mdLWWa:f4KxkoBtToyoEG7suMoV8KhnkwM= +authKey=${DMAAP_AUTHKEY} authDate=2016-02-18T13:57:37-0800 host=ueb.api.simpledemo.onap.org:3904 topic=AAI-EVENT @@ -30,7 +30,7 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 AFT_DME2_EP_READ_TIMEOUT_MS=50000 sessionstickinessrequired=NO DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt -sdnc.odl.user=admin -sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +sdnc.odl.user=${ODL_USER} +sdnc.odl.password=${ODL_PASSWORD} sdnc.odl.url-base=http://sdnhost:8181/restconf/operations diff --git a/installation/dmaap-listener/src/main/properties/dblib.properties b/installation/dmaap-listener/src/main/properties/dblib.properties index 9506ac8d..f54e099e 100644 --- a/installation/dmaap-listener/src/main/properties/dblib.properties +++ b/installation/dmaap-listener/src/main/properties/dblib.properties @@ -23,11 +23,11 @@ org.onap.ccsdk.sli.dbtype=jdbc org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01 -org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/${MYSQL_DATABASE} org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver -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.database=${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.user=${MYSQL_USER} +org.onap.ccsdk.sli.jdbc.password=${MYSQL_PASSWORD} org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01 org.onap.ccsdk.sli.jdbc.connection.timeout=50 org.onap.ccsdk.sli.jdbc.request.timeout=100 diff --git a/installation/dmaap-listener/src/main/properties/dhcpalert.properties b/installation/dmaap-listener/src/main/properties/dhcpalert.properties index ae9804f6..65b3e7fc 100755 --- a/installation/dmaap-listener/src/main/properties/dhcpalert.properties +++ b/installation/dmaap-listener/src/main/properties/dhcpalert.properties @@ -9,10 +9,10 @@ routeOffer=MR1 SubContextPath =/ Protocol =http MethodType =GET -username =admin -password =admin +username =${DMAAP_USER} +password =${DMAAP_PASSWORD} contenttype =application/json -authKey=fxoW4jZrO7mdLWWa:f4KxkoBtToyoEG7suMoV8KhnkwM= +authKey=${DMAAP_AUTHKEY} authDate=2016-02-18T13:57:37-0800 host=ueb.api.simpledemo.onap.org:3904 topic=VCPE-DHCP-EVENT @@ -30,7 +30,7 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 AFT_DME2_EP_READ_TIMEOUT_MS=50000 sessionstickinessrequired=NO DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt -sdnc.odl.user=admin -sdnc.odl.password=admin -sdnc.odl.url-base=https://sdncodl.st.us.aic.cip.att.com:8443/restconf/operations +sdnc.odl.user=${ODL_USER} +sdnc.odl.password=${ODL_PASSWORD} +sdnc.odl.url-base=https://sdnc.onap:8443/restconf/operations diff --git a/installation/dmaap-listener/src/main/properties/dmaap-consumer-CMNotify.properties b/installation/dmaap-listener/src/main/properties/dmaap-consumer-CMNotify.properties index aae34a26..b399d27f 100644 --- a/installation/dmaap-listener/src/main/properties/dmaap-consumer-CMNotify.properties +++ b/installation/dmaap-listener/src/main/properties/dmaap-consumer-CMNotify.properties @@ -9,10 +9,10 @@ routeOffer=MR1 SubContextPath =/ Protocol =http MethodType =GET -username =admin -password =admin +username =${DMAAP_USER} +password =${DMAAP_PASSWORD} contenttype =application/json -authKey=fs20cKwalJ6ry4kX:7Hqm6BDZK47IKxGRkOPFk33qMYs= +authKey=${DMAAP_AUTHKEY} authDate=2019-04-09T04:28:40-05:00 host=message-router.onap:3904 topic=CM-NOTIFICATION @@ -30,6 +30,6 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 AFT_DME2_EP_READ_TIMEOUT_MS=50000 sessionstickinessrequired=NO DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt -sdnc.odl.user=admin -sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +sdnc.odl.user=${ODL_USER} +sdnc.odl.password=${ODL_PASSWORD} sdnc.odl.url-base=http://sdnc.onap:8282/restconf/operations diff --git a/installation/dmaap-listener/src/main/properties/dmaap-consumer-RANSlice.properties b/installation/dmaap-listener/src/main/properties/dmaap-consumer-RANSlice.properties index de24da08..7f6e5e34 100644 --- a/installation/dmaap-listener/src/main/properties/dmaap-consumer-RANSlice.properties +++ b/installation/dmaap-listener/src/main/properties/dmaap-consumer-RANSlice.properties @@ -9,10 +9,10 @@ routeOffer=MR1 SubContextPath =/ Protocol =http MethodType =GET -username =admin -password =admin +username =${DMAAP_USER} +password =${DMAAP_PASSWORD} contenttype =application/json -authKey=fs20cKwalJ6ry4kX:7Hqm6BDZK47IKxGRkOPFk33qMYs= +authKey=${DMAAP_AUTHKEY} authDate=2019-04-09T04:28:40-05:00 host=message-router.onap:3904 topic=RAN-Slice-Mgmt @@ -30,6 +30,6 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 AFT_DME2_EP_READ_TIMEOUT_MS=50000 sessionstickinessrequired=NO DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt -sdnc.odl.user=admin -sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +sdnc.odl.user=${ODL_USER} +sdnc.odl.password=${ODL_PASSWORD} sdnc.odl.url-base=http://sdnc.onap:8282/restconf/operations diff --git a/installation/dmaap-listener/src/main/properties/dmaap-consumer-a1Adapter-policy.properties b/installation/dmaap-listener/src/main/properties/dmaap-consumer-a1Adapter-policy.properties index edb7c453..f01cf219 100644 --- a/installation/dmaap-listener/src/main/properties/dmaap-consumer-a1Adapter-policy.properties +++ b/installation/dmaap-listener/src/main/properties/dmaap-consumer-a1Adapter-policy.properties @@ -9,10 +9,10 @@ routeOffer=MR1 SubContextPath =/ Protocol =http MethodType =GET -username =admin -password =admin +username =${DMAAP_USER} +password =${DMAAP_PASSWORD} contenttype =application/json -authKey=fs20cKwalJ6ry4kX:7Hqm6BDZK47IKxGRkOPFk33qMYs= +authKey=${DMAAP_AUTHKEY} authDate=2019-04-09T04:28:40-05:00 host=message-router.onap:3904 topic=A1-P @@ -30,6 +30,6 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 AFT_DME2_EP_READ_TIMEOUT_MS=50000 sessionstickinessrequired=NO DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt -sdnc.odl.user=admin -sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -sdnc.odl.url-base=http://sdnc.onap:8282/restconf/operations +sdnc.odl.user=${ODL_USER} +sdnc.odl.password=${ODL_PASSWORD} +sdnc.odl.url-base=https://sdnc.onap:8443/restconf/operations diff --git a/installation/dmaap-listener/src/main/properties/dmaap-consumer-oofpcipoc.properties b/installation/dmaap-listener/src/main/properties/dmaap-consumer-oofpcipoc.properties index f933edee..222d8195 100644 --- a/installation/dmaap-listener/src/main/properties/dmaap-consumer-oofpcipoc.properties +++ b/installation/dmaap-listener/src/main/properties/dmaap-consumer-oofpcipoc.properties @@ -9,10 +9,10 @@ routeOffer=MR1 SubContextPath =/ Protocol =http MethodType =GET -username =admin -password =admin +username =${DMAAP_USER} +password =${DMAAP_PASSWORD} contenttype =application/json -authKey=fs20cKwalJ6ry4kX:7Hqm6BDZK47IKxGRkOPFk33qMYs= +authKey=${DMAAP_AUTHKEY} authDate=2019-04-09T04:28:40-05:00 host=message-router.onap:3904 topic=SDNR-CL @@ -30,6 +30,6 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 AFT_DME2_EP_READ_TIMEOUT_MS=50000 sessionstickinessrequired=NO DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt -sdnc.odl.user=admin -sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +sdnc.odl.user=${ODL_USER} +sdnc.odl.password=${ODL_PASSWORD} sdnc.odl.url-base=http://sdnc.onap:8282/restconf/operations diff --git a/installation/dmaap-listener/src/main/properties/lcm.properties b/installation/dmaap-listener/src/main/properties/lcm.properties index 22dbebe5..507433b7 100755 --- a/installation/dmaap-listener/src/main/properties/lcm.properties +++ b/installation/dmaap-listener/src/main/properties/lcm.properties @@ -9,10 +9,10 @@ routeOffer=MR1 SubContextPath =/ Protocol =http MethodType =GET -username =admin -password =admin +username =${DMAAP_USER} +password =${DMAAP_PASSWORD} contenttype =application/json -authKey=fxoW4jZrO7mdLWWa:f4KxkoBtToyoEG7suMoV8KhnkwM= +authKey=${DMAAP_AUTHKEY} authDate=2016-02-18T13:57:37-0800 host=ueb.api.simpledemo.onap.org:3904 topic=SDNC-LCM-READ @@ -30,7 +30,7 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 AFT_DME2_EP_READ_TIMEOUT_MS=50000 sessionstickinessrequired=NO DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt -sdnc.odl.user=admin -sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -sdnc.odl.url-base=http://sdnhost:8181/restconf/operations +sdnc.odl.user=${ODL_USER} +sdnc.odl.password=${ODL_PASSWORD} +sdnc.odl.url-base=https://sdnc.onap:8443/restconf/operations diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index be951d2d..5cc35d65 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -155,7 +155,7 @@ <alias>sdnc-container</alias> <run> <env> - <ODL_ADMIN_PASSWORD>admin</ODL_ADMIN_PASSWORD> + <ODL_PASSWORD>admin</ODL_PASSWORD> <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD> <MYSQL_USER>sdnctl</MYSQL_USER> <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD> diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index 7a224877..bcf8893c 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -212,7 +212,7 @@ printf "Installing SDNC/R from startODL.sh script\n" ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_FEATURES_BOOT_FILE=$ODL_HOME/etc/org.apache.karaf.features.cfg -ODL_ADMIN_USERNAME=${ODL_ADMIN_USERNAME:-admin} +ODL_USER=${ODL_USER:-admin} ODL_REMOVEIDMDB=${ODL_REMOVEIDMDB:-true} if $ODL_REMOVEIDMDB ; then @@ -253,7 +253,7 @@ SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false} SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all} NOTOK=1 #export for installCerts.py -export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME +export ODL_PASSWORD ODL_USER if $JDEBUG ; then printf "Activate remote debugging\n" @@ -326,8 +326,8 @@ if $SDNRINIT ; then fi # do not start container if ADMIN_PASSWORD is not set -if [ -z "$ODL_ADMIN_PASSWORD" ]; then - echo "ODL_ADMIN_PASSWORD is not set" +if [ -z "$ODL_PASSWORD" ]; then + echo "ODL_PASSWORD is not set" exit 1 fi diff --git a/installation/src/main/properties/aaiclient.properties b/installation/src/main/properties/aaiclient.properties index 65683836..395510d7 100755 --- a/installation/src/main/properties/aaiclient.properties +++ b/installation/src/main/properties/aaiclient.properties @@ -27,11 +27,11 @@ # Certificate keystore and truststore # org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/sdnc/data/stores/truststoreONAPall.jks -org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=changeit +org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=${AAI_TRUSTSTORE_PASSWORD} org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true -org.onap.ccsdk.sli.adaptors.aai.client.name=sdnc@sdnc.onap.org -org.onap.ccsdk.sli.adaptors.aai.client.psswd=demo123456! +org.onap.ccsdk.sli.adaptors.aai.client.name=${AAI_CLIENT_NAME} +org.onap.ccsdk.sli.adaptors.aai.client.psswd=${AAI_CLIENT_PASSWORD} org.onap.ccsdk.sli.adaptors.aai.application=openECOMP # diff --git a/installation/src/main/properties/ansible-adapter.properties b/installation/src/main/properties/ansible-adapter.properties index 761758bb..3cc0f28b 100644 --- a/installation/src/main/properties/ansible-adapter.properties +++ b/installation/src/main/properties/ansible-adapter.properties @@ -30,7 +30,7 @@ # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded # to supply configuration options org.onap.appc.bootstrap.file=appc.properties -org.onap.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties +org.onap.appc.bootstrap.path=${HOME},/opt/opendaylight/current/properties appc.application.name=APPC @@ -44,5 +44,5 @@ org.onap.appc.provider.adaptor.name=org.onap.appc.appc_ansible_adapter # Default truststore path and password org.onap.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js -org.onap.appc.adapter.ansible.trustStore.trustPasswd=changeit +org.onap.appc.adapter.ansible.trustStore.trustPasswd=${ANSIBLE_TRUSTSTORE_PASSWORD} org.onap.appc.adapter.ansible.clientType=TRUST_ALL diff --git a/installation/src/main/properties/data-migrator.properties b/installation/src/main/properties/data-migrator.properties index 9bec60dd..74d389e5 100644 --- a/installation/src/main/properties/data-migrator.properties +++ b/installation/src/main/properties/data-migrator.properties @@ -17,10 +17,10 @@ # limitations under the License. # ============LICENSE_END========================================================= ### -org.onap.sdnc.datamigrator.source.host=http://10.53.234.213:30202 -org.onap.sdnc.datamigrator.source.user=admin -org.onap.sdnc.datamigrator.source.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -org.onap.sdnc.datamigrator.target.host=http://10.53.234.215:30202 -org.onap.sdnc.datamigrator.target.user=admin -org.onap.sdnc.datamigrator.target.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +org.onap.sdnc.datamigrator.source.host=https://sdnc.onap:30267 +org.onap.sdnc.datamigrator.source.user=${ODL_USER} +org.onap.sdnc.datamigrator.source.password=${ODL_PASSWORD} +org.onap.sdnc.datamigrator.target.host=https://sdnc.onap:30267 +org.onap.sdnc.datamigrator.target.user=${ODL_USER} +org.onap.sdnc.datamigrator.target.password=${ODL_PASSWORD} org.onap.sdnc.datamigrator.data.path=/tmp
\ No newline at end of file diff --git a/installation/src/main/properties/dblib.properties b/installation/src/main/properties/dblib.properties index 9506ac8d..f54e099e 100644 --- a/installation/src/main/properties/dblib.properties +++ b/installation/src/main/properties/dblib.properties @@ -23,11 +23,11 @@ org.onap.ccsdk.sli.dbtype=jdbc org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01 -org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/${MYSQL_DATABASE} org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver -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.database=${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.user=${MYSQL_USER} +org.onap.ccsdk.sli.jdbc.password=${MYSQL_PASSWORD} org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01 org.onap.ccsdk.sli.jdbc.connection.timeout=50 org.onap.ccsdk.sli.jdbc.request.timeout=100 diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties index d4127133..d633f926 100644 --- a/installation/src/main/properties/generic-resource-api-dg.properties +++ b/installation/src/main/properties/generic-resource-api-dg.properties @@ -1,23 +1,23 @@ restapi.templateDir=/opt/onap/sdnc/restapi/templates controller.url=http://localhost:8181 -controller.user=admin -controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +controller.user=${ODL_USER} +controller.pwd=${ODL_HOST} honeycomb.url=http://{honeycomb-instance-ip}:8183 -honeycomb.user=admin -honeycomb.pwd=admin +honeycomb.user=${HONEYCOMB_USER} +honeycomb.pwd=${HONEYCOMB_PASSWORD} restapi.trustStoreFileName=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks -restapi.trustStorePassword=adminadmin +restapi.trustStorePassword=${TRUSTSTORE_PASSWORD} restapi.keyStoreFileName=/opt/onap/sdnc/data/stores/sdnc.p12 -restapi.keyStorePassword=adminadmin +restapi.keyStorePassword=${KEYSTORE_PASSWORD} restapi.connection-oof-url=http://oof-osdf:8698/api/oof/v1/route naming.gen-name.url=http://neng-serv:8080 -naming.gen-name.user=ccsdkapps -naming.gen-name.pwd=ccsdkapps -so.user=sdncaBpmn -so.pwd=password1$ +naming.gen-name.user=${NENG_NAME} +naming.gen-name.pwd=${NENG_PASSWORD} +so.user=${SO_USER} +so.pwd=${SO_PASSWORD} cds.url=http://cds-blueprints-processor-http:8080 -cds.user=ccsdkapps -cds.pwd=ccsdkapps +cds.user=${CDS_USER} +cds.pwd=${CDS_PASSWORD} # Templates restapi.sz.templatefile=security-zone-allotted-resource.json diff --git a/installation/src/main/properties/lcm-dg.properties b/installation/src/main/properties/lcm-dg.properties index a4cfc4aa..5a3a9e12 100644 --- a/installation/src/main/properties/lcm-dg.properties +++ b/installation/src/main/properties/lcm-dg.properties @@ -1,7 +1,7 @@ #ANSIBLE ansible.agenturl=http://ansiblehost:8000/Dispatch -ansible.user=sdnc -ansible.password=sdnc +ansible.user=${ANSIBLE_USER} +ansible.password=${ANSIBLE_PASSWORD} ansible.lcm.localparameters= ansible.nodelist= ansible.timeout=60 diff --git a/installation/src/main/properties/mdsal-resource.properties b/installation/src/main/properties/mdsal-resource.properties index 47c8ebf7..f4dfab1a 100644 --- a/installation/src/main/properties/mdsal-resource.properties +++ b/installation/src/main/properties/mdsal-resource.properties @@ -19,8 +19,8 @@ # ============LICENSE_END========================================================= ### -org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-user=admin -org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-passwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-user=${ODL_USER} +org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-passwd=${ODL_PASSWORD} 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/optical-service-dg.properties b/installation/src/main/properties/optical-service-dg.properties index 37779f56..9d9778a3 100644 --- a/installation/src/main/properties/optical-service-dg.properties +++ b/installation/src/main/properties/optical-service-dg.properties @@ -1,7 +1,7 @@ restapi.templateDir=/opt/onap/sdnc/restapi/templates controller.url=http://sdnc.onap:8282 -controller.user=admin -controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +controller.user=${ODL_USER} +controller.pwd=${ODL_PASSWORD} odlUrlBase=http://sdnc-oam.onap:8282/restconf/operations sdncEndpoint=SLI-API:execute-graph @@ -15,8 +15,8 @@ restapi.template.so.response.filename=async-response-so.json #URLS sdnc.async.url=/asyncNotification -so.username=sdncaBpmn -so.password=password1$ +so.username=${SO_USER} +so.password=${SO_PASSWORD} tapi.cep.details.url=/cxf/tapi/v2/connectivities/service-interface-points?topology-id-or-name=otn&sip-id-or-name= tapi.delete.service.url=/cxf/tapi/v2/connectivities/tapi-services?topology-id-or-name=otn&service-id-or-name= tapi.get.services.url=/cxf/tapi/v2/connectivities/tapi-services?topology-id-or-name=otn&service-id-or-name= diff --git a/installation/src/main/properties/sql-resource.properties b/installation/src/main/properties/sql-resource.properties index ac32f773..0e3714eb 100644 --- a/installation/src/main/properties/sql-resource.properties +++ b/installation/src/main/properties/sql-resource.properties @@ -19,5 +19,5 @@ # ============LICENSE_END========================================================= ### -org.openecomp.sdnc.resource.sql.cryptkey=QtfJMKggVk +org.onap.sdnc.resource.sql.cryptkey=${SQL_CRYPTKEY:-duMmyCrYptkEy} diff --git a/installation/src/main/properties/svclogic.properties b/installation/src/main/properties/svclogic.properties index 54d667cf..41ad460e 100644 --- a/installation/src/main/properties/svclogic.properties +++ b/installation/src/main/properties/svclogic.properties @@ -21,9 +21,9 @@ 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.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.database=${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.user=${MYSQL_USER} +org.onap.ccsdk.sli.jdbc.password=${MYSQL_PASSWORD} org.xml.sax.driver=org.apache.xerces.parsers.SAXParser diff --git a/installation/src/main/properties/svclogic.properties.sdnctldb01 b/installation/src/main/properties/svclogic.properties.sdnctldb01 index 54d667cf..41ad460e 100755 --- a/installation/src/main/properties/svclogic.properties.sdnctldb01 +++ b/installation/src/main/properties/svclogic.properties.sdnctldb01 @@ -21,9 +21,9 @@ 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.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.database=${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.user=${MYSQL_USER} +org.onap.ccsdk.sli.jdbc.password=${MYSQL_PASSWORD} org.xml.sax.driver=org.apache.xerces.parsers.SAXParser diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml index 7adc6202..01c972c4 100644 --- a/installation/src/main/yaml/docker-compose.yml +++ b/installation/src/main/yaml/docker-compose.yml @@ -8,17 +8,21 @@ networks: services: + db: - image: mysql/mysql-server:5.6 + image: mariadb:10.5 container_name: sdnc_db_container ports: - - "3306" + - "23306:3306" environment: - - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - MYSQL_ROOT_HOST=% - logging: + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + logging: driver: "json-file" - options: + options: max-size: "30m" max-file: "5" @@ -35,7 +39,11 @@ services: - db:sdnctldb01 - db:sdnctldb02 environment: - - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + - ANSIBLE_TRUSTSTORE_PASSWORD=${ANSIBLE_TRUSTSTORE_PASSWORD} logging: driver: "json-file" options: @@ -57,13 +65,28 @@ services: - db:sdnctldb02 - ansible:ansiblehost environment: - - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties - SDNC_BIN=/opt/onap/sdnc/bin - ODL_CERT_DIR=/tmp - - ODL_ADMIN_USERNAME=admin - - ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + - ODL_ADMIN_USERNAME=${ODL_USER} + - ODL_ADMIN_PASSWORD=${ODL_PASSWORD} + - ODL_USER=${ODL_USER} + - ODL_PASSWORD=${ODL_PASSWORD} - SDNC_DB_INIT=true + - HONEYCOMB_USER=${HONEYCOMB_USER} + - HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD} + - TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD} + - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD} + - SO_USER=${SO_USER} + - SO_PASSWORD=${SO_PASSWORD} + - NENG_USER=${NENG_USER} + - NENG_PASSWORD=${NENG_PASSWORD} + - CDS_USER=${CDS_USER} + - CDS_PASSWORD=${CDS_PASSWORD} + - ANSIBLE_USER=${ANSIBLE_USER} + - ANSIBLE_PASSWORD=${ANSIBLE_PASSWORD} + - SQL_CRYPTKEY=${SQL_CRYPTKEY} - A1_TRUSTSTORE_PASSWORD=a1adapter # The default truststore for A1 adapter can be overridden by mounting a new # truststore (uncomment the lines below), whereas the corresponding password @@ -97,7 +120,10 @@ services: - db:sdnctldb02 - sdnc:sdnhost environment: - - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties logging: driver: "json-file" @@ -119,6 +145,13 @@ services: environment: - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties - PROPERTY_DIR=/opt/onap/sdnc/data/properties + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + - ODL_USER=${ODL_USER} + - ODL_PASSWORD=${ODL_PASSWORD} + - ASDC_USER=${ASDC_USER} + - ASDC_PASSWORD=${ASDC_PASSWORD} logging: driver: "json-file" options: @@ -139,6 +172,14 @@ services: environment: - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties - PROPERTY_DIR=/opt/onap/sdnc/data/properties + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + - ODL_USER=${ODL_USER} + - ODL_PASSWORD=${ODL_PASSWORD} + - DMAAP_USER=${DMAAP_USER} + - DMAAP_PASSWORD=${DMAAP_PASSWORD} + - DMAAP_AUTHKEY=${DMAAP_AUTHKEY} logging: driver: "json-file" options: diff --git a/installation/ueb-listener/src/main/properties/dblib.properties b/installation/ueb-listener/src/main/properties/dblib.properties index 9506ac8d..f54e099e 100644 --- a/installation/ueb-listener/src/main/properties/dblib.properties +++ b/installation/ueb-listener/src/main/properties/dblib.properties @@ -23,11 +23,11 @@ org.onap.ccsdk.sli.dbtype=jdbc org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01 -org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/${MYSQL_DATABASE} org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver -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.database=${MYSQL_DATABASE} +org.onap.ccsdk.sli.jdbc.user=${MYSQL_USER} +org.onap.ccsdk.sli.jdbc.password=${MYSQL_PASSWORD} org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01 org.onap.ccsdk.sli.jdbc.connection.timeout=50 org.onap.ccsdk.sli.jdbc.request.timeout=100 diff --git a/installation/ueb-listener/src/main/properties/ueb-listener.properties b/installation/ueb-listener/src/main/properties/ueb-listener.properties index f0b00164..72f82a16 100755 --- a/installation/ueb-listener/src/main/properties/ueb-listener.properties +++ b/installation/ueb-listener/src/main/properties/ueb-listener.properties @@ -7,11 +7,11 @@ org.onap.ccsdk.sli.northbound.uebclient.consumer-id=sdnc #org.onap.ccsdk.sli.northbound.uebclient.consumer-id=sdc-COpenSource-Env11-ccsdkTest-dockero #org.onap.ccsdk.sli.northbound.uebclient.msg-bus-address=10.12.5.127 org.onap.ccsdk.sli.northbound.uebclient.environment-name=AUTO -org.onap.ccsdk.sli.northbound.uebclient.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -org.onap.ccsdk.sli.northbound.uebclient.user=sdnc -org.onap.ccsdk.sli.northbound.uebclient.sdnc-user=admin -org.onap.ccsdk.sli.northbound.uebclient.sdnc-passwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -org.onap.ccsdk.sli.northbound.uebclient.asdc-api-base-url=http://sdnhost:8181/restconf/operations/ +org.onap.ccsdk.sli.northbound.uebclient.password=${ASDC_PASSWORD} +org.onap.ccsdk.sli.northbound.uebclient.user=${ASDC_USER} +org.onap.ccsdk.sli.northbound.uebclient.sdnc-user=${ODL_USER} +org.onap.ccsdk.sli.northbound.uebclient.sdnc-passwd=${ODL_PASSWORD} +org.onap.ccsdk.sli.northbound.uebclient.asdc-api-base-url=https://sdnc.onap:8443/restconf/operations/ org.onap.ccsdk.sli.northbound.uebclient.asdc-api-namespace=org:onap:ccsdk org.onap.ccsdk.sli.northbound.uebclient.spool.incoming=/opt/onap/sdnc/ueb-listener/spool/incoming org.onap.ccsdk.sli.northbound.uebclient.spool.archive=/opt/onap/sdnc/ueb-listener/spool/archive |