From: Dominic Lunanuova <dgl@research.att.com>
Date: Tue, 30 Apr 2019 00:13:38 +0000 (+0000)
Subject: Merge "Fix problem with post install job"
X-Git-Tag: 1.1.4~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=52ef341d9127771ed5876f0f8057a6d2db9b006e;p=dmaap%2Fbuscontroller.git

Merge "Fix problem with post install job"
---

52ef341d9127771ed5876f0f8057a6d2db9b006e
diff --cc dbc-client/misc/dbc-client
index 1e079bf,e9b01f5..d1de3e1
--- a/dbc-client/misc/dbc-client
+++ b/dbc-client/misc/dbc-client
@@@ -58,14 -55,9 +58,14 @@@ config() 
  	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
+ 		printf "key \"$PEMDIR/$KEYPEM\"\ncacert \"$PEMDIR/$CAPEM\"\ncert \"$PEMDIR/${CLIENTPEM}:${CERTPWD}\"" > $PEMDIR/curl.cred
  		CURLCRED="-K $PEMDIR/curl.cred"
  	else
  		echo "Warning: PEM files for authorization not found!"