Code Review
/
sdnc
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Supporting 3 or more network domains for Transport Slicing use case. Issue...
[sdnc/oam.git]
/
installation
/
src
/
main
/
properties
/
generic-resource-api-dg.properties
diff --git
a/installation/src/main/properties/generic-resource-api-dg.properties
b/installation/src/main/properties/generic-resource-api-dg.properties
index
5d4654a
..
980a281
100644
(file)
--- 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
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.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.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.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
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.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
# Templates
restapi.sz.templatefile=security-zone-allotted-resource.json