diff options
| author |   varun gudisena <vg411h@att.com> | 2018-03-07 20:28:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-07 20:28:02 +0000 |
| commit | ea57116599bd987de0659ed00758fb4608b5d21c (patch) | |
| tree | 6f767a31603b45d28e966065c0437e5606e3db98 | |
| parent | b8f4517ccb9eb075443f6929e2c19c41a3c56b7a (diff) | |
| parent | ccb31a508c0ec558f00454f7e814272b273d72d7 (diff) | |
Merge "changes for CSIT integration"
| -rw-r--r-- | misc/dmaapbc | 13 | ||||
| -rw-r--r-- | misc/dmaapbc.properties.tmpl | 5 |
2 files changed, 11 insertions, 7 deletions
diff --git a/misc/dmaapbc b/misc/dmaapbc index 3d19f88..19bb3f7 100644 --- a/misc/dmaapbc +++ b/misc/dmaapbc @@ -34,12 +34,13 @@ config() { fi cd $APP_ROOT source $CONTAINER_CONFIG - if [ ! -f $APP_ROOT/misc/cert-client-init.sh ] - then - echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore" - exit 1 - fi - $APP_ROOT/misc/cert-client-init.sh + # comment out till certs are available + #if [ ! -f $APP_ROOT/misc/cert-client-init.sh ] + #then + # echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore" + # exit 1 + #fi + #$APP_ROOT/misc/cert-client-init.sh . misc/dmaapbc.properties.tmpl > etc/dmaapbc.properties . misc/PolicyEngineApi.properties.tmpl > config/PolicyEngineApi.properties set +x diff --git a/misc/dmaapbc.properties.tmpl b/misc/dmaapbc.properties.tmpl index c60d689..5b7ee28 100644 --- a/misc/dmaapbc.properties.tmpl +++ b/misc/dmaapbc.properties.tmpl @@ -2,6 +2,8 @@ cat <<!EOF # # Configuration parameters fixed at startup for the DMaaP Bus Controller # +# CSIT TESTING +csit: ${DMAAPBC_CSIT:-No} # # URI to retrieve dynamic DR configuration # @@ -185,7 +187,8 @@ UsePE: ${DMAAPBC_PE_ENABLED:-false} # Argument to decisionAttributes.put("AAF_ENVIRONMENT", X); # where X is: TEST= UAT, PROD = PROD, DEVL = TEST # -PeAafEnvironment: ${DMAAPBC_PE_AAF_ENV:-DEVL} +PeAafEnvironment: ${DMAAPBC_PE_AAF_ENV:-CSIT} +PeAafUrl.CSIT: ${DMAAPBC_AAF_URL:-http://localhost:8095/proxy/} PeAafUrl.DEVL: https://aafdev.onap.org:8095/proxy/ PeAafUrl.TEST: https://aafist..onap.org:8095/proxy/ PeAafUrl.PROD: https://aafprod.onap.org:8095/proxy/ |