Code Review
/
dmaap
/
buscontroller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Workaround for deployment problem
[dmaap/buscontroller.git]
/
dbc-client
/
misc
/
dbc-client
diff --git
a/dbc-client/misc/dbc-client
b/dbc-client/misc/dbc-client
index
c29ec86
..
1e079bf
100644
(file)
--- a/
dbc-client/misc/dbc-client
+++ b/
dbc-client/misc/dbc-client
@@
-40,6
+40,9
@@
CAPEM=${CAPEM:-ca.pem}
CLIENTPEM=${CLIENTPEM:-client.pem}
KEYPEM=${KEYPEM:-key.pem}
CERTPWD=${CERTPWD:-'2U[iOZzMHI:.#tdCwlBqc;}S'}
CLIENTPEM=${CLIENTPEM:-client.pem}
KEYPEM=${KEYPEM:-key.pem}
CERTPWD=${CERTPWD:-'2U[iOZzMHI:.#tdCwlBqc;}S'}
+AUTH_METHOD=${AUTH_METHOD:-basicAuth}
+BA_IDENTITY=${BA_IDENTITY:-dmaap-bc@dmaap-bc.onap.org}
+BA_PWD=${BA_PWD:-'demo123456!'}
@@
-55,7
+58,12
@@
config() {
cd $PEMDIR
pwd
ls -l
cd $PEMDIR
pwd
ls -l
- if [ -f $CAPEM -a -f $CLIENTPEM -a -f $KEYPEM ]
+ echo "AUTH_METHOD=$AUTH_METHOD"
+ if [ "$AUTH_METHOD" = "basicAuth" ]
+ then
+ echo "-u ${BA_IDENTITY}:${BA_PWD}" > $PEMDIR/curl.cred
+ CURLCRED="-K $PEMDIR/curl.cred"
+ elif [ -f $CAPEM -a -f $CLIENTPEM -a -f $KEYPEM ]
then
echo "--key $PEMDIR/$KEYPEM --cacert $PEMDIR/$CAPEM --cert $PEMDIR/${CLIENTPEM}:${CERTPWD}" > $PEMDIR/curl.cred
CURLCRED="-K $PEMDIR/curl.cred"
then
echo "--key $PEMDIR/$KEYPEM --cacert $PEMDIR/$CAPEM --cert $PEMDIR/${CLIENTPEM}:${CERTPWD}" > $PEMDIR/curl.cred
CURLCRED="-K $PEMDIR/curl.cred"