From 38d8f5f82c952db34e139488dd7619f620ecc742 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 22 Feb 2021 11:20:18 -0500 Subject: Remove embedded passwords Updated properties files to use env variables instead of embedded default passwords. Change-Id: I7b5a796bbb5d386dda8cba47cbb977ec47838a11 Issue-ID: SDNC-1482 Signed-off-by: Dan Timoney Former-commit-id: d0a86a8593f3832f11198e91c2343db6fad5a1a9 --- .../dmaap-listener/src/main/properties/aai.properties | 10 +++++----- .../dmaap-listener/src/main/properties/dblib.properties | 8 ++++---- .../dmaap-listener/src/main/properties/dhcpalert.properties | 12 ++++++------ .../src/main/properties/dmaap-consumer-CMNotify.properties | 10 +++++----- .../src/main/properties/dmaap-consumer-RANSlice.properties | 10 +++++----- .../properties/dmaap-consumer-a1Adapter-policy.properties | 12 ++++++------ .../src/main/properties/dmaap-consumer-oofpcipoc.properties | 10 +++++----- .../dmaap-listener/src/main/properties/lcm.properties | 12 ++++++------ 8 files changed, 42 insertions(+), 42 deletions(-) (limited to 'installation/dmaap-listener') 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 -- cgit 1.2.3-korg