From a25c92363d1fdb3b3f9fc91203912febc19ed3c0 Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Mon, 2 Mar 2020 11:07:31 -0500 Subject: Load blueprint into DCAE inventory at boot Load k8splugin 2.0.0 in addition to 1.7.2 Issue-ID: DCAEGEN2-2049 Issue-ID: DCAEGEN2-1938 Signed-off-by: Jack Lucas Change-Id: I5306bf54b0c443b83fb6dc5afb60b07e87d741e6 --- scripts/bootstrap.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'scripts/bootstrap.sh') diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 909c203..9fe7cd0 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -40,12 +40,13 @@ CMPROTO=${CMPROTO:-http} CMPORT=${CMPORT:-80} # Set up additional parameters for using HTTPS +CACERT="/certs/cacert.pem" CFYTLS="" CURLTLS="" if [ $CMPROTO = "https" ] then - CFYTLS="--rest-certificate /certs/cacert.pem --ssl" - CURLTLS="--cacert /certs/cacert.pem" + CFYTLS="--rest-certificate $CACERT --ssl" + CURLTLS="--cacert $CACERT" fi ### FUNCTION DEFINITIONS ### @@ -230,6 +231,14 @@ deploy holmes_engine k8s-holmes-engine.yaml k8s-holmes_engine-inputs.yaml # Display deployments, for debugging purposes cfy deployments list +# Load blueprints into DCAE inventory as +# DCAE service types +. /scripts/inventory.sh +for BP in /blueprints/*.yaml +do + upload_service_type $BP $CACERT +done + # Continue running keep_running "Finished bootstrap steps." echo "Exiting!" -- cgit 1.2.3-korg