diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index a75b5f28..8a40d49e 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1683,39 +1683,39 @@ VCENTER-SSL(){ echo -en "${idsCL[LightCyan]}Checking if certificate needs to be updated on vCenter... ${idsCL[Default]}" VCCERTDAYS=$(${FOLDER}/ssl-cert-check/ssl-cert-check -p 443 -s ${VCHOSTNAME} -N) - if [ ${VCCERTDAYS} -lt 30 ]; then + if [ "${VCCERTDAYS}" -lt 30 ]; then echo -e "${idsCL[Green]}Certificate is still valid for ${VCCERTDAYS} days yet, no noeed to update${idsCL[Default]}" exit 0 else - echo -e "${idsCL[Green]}Certificate needds to be updated${idsCL[Default]}" + echo -e "${idsCL[Green]}Certificate needs to be updated${idsCL[Default]}" echo fi - echo -en "${idsCL[LightCyan]}Updating certificate on vCenter... ${idsCL[Default]}" - - SESSION_ID=$(curl -s -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' --header 'vmware-use-header-authn: test' --header 'vmware-api-session-id: null' -u $CRED "$SERVER/rest/com/vmware/cis/session" --insecure | python3 -c "import sys, json; print(json.load(sys.stdin)['value'])") - - PRIVKEY=$(awk -v ORS='\\n' '1' "$CERTDIR/privkey.pem") - CERT=$(awk -v ORS='\\n' '1' "$CERTDIR/cert.pem") - - REQUEST_BODY="{ \"spec\" : { \"cert\" : \"$CERT\", \"key\" : \"$PRIVKEY\" } }" - - curl --insecure -X PUT "$SERVER/rest/vcenter/certificate-management/vcenter/tls" \ - -H "vmware-api-session-id: $SESSION_ID" \ - -H "Content-type: application/json" \ - -d "$REQUEST_BODY" - - curl --insecure -X DELETE "$SERVER/rest/com/vmware/cis/session" -H "vmware-api-session-id: $SESSION_ID" - echo -e "${idsCL[Green]}Done${idsCL[Default]}" - echo - echo -en "${idsCL[LightCyan]}Stopping vCenter services... ${idsCL[Default]}" - ssh -i ~/.ssh/id_rsa root@vcenter.scity.us 'service-control --stop --all' - echo -e "${idsCL[Green]}Done${idsCL[Default]}" - echo -en "${idsCL[LightCyan]}Starting vCenter services... ${idsCL[Default]}" - ssh -i ~/.ssh/id_rsa root@vcenter.scity.us 'service-control --start --all' - echo -e "${idsCL[Green]}Done${idsCL[Default]}" - echo - echo -e "${idsCL[Green]}The vCenter certifcate has been updated${idsCL[Default]}" + # echo -en "${idsCL[LightCyan]}Updating certificate on vCenter... ${idsCL[Default]}" + # + # SESSION_ID=$(curl -s -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' --header 'vmware-use-header-authn: test' --header 'vmware-api-session-id: null' -u $CRED "$SERVER/rest/com/vmware/cis/session" --insecure | python3 -c "import sys, json; print(json.load(sys.stdin)['value'])") + # + # PRIVKEY=$(awk -v ORS='\\n' '1' "$CERTDIR/privkey.pem") + # CERT=$(awk -v ORS='\\n' '1' "$CERTDIR/cert.pem") + # + # REQUEST_BODY="{ \"spec\" : { \"cert\" : \"$CERT\", \"key\" : \"$PRIVKEY\" } }" + # + # curl --insecure -X PUT "$SERVER/rest/vcenter/certificate-management/vcenter/tls" \ + # -H "vmware-api-session-id: $SESSION_ID" \ + # -H "Content-type: application/json" \ + # -d "$REQUEST_BODY" + # + # curl --insecure -X DELETE "$SERVER/rest/com/vmware/cis/session" -H "vmware-api-session-id: $SESSION_ID" + # echo -e "${idsCL[Green]}Done${idsCL[Default]}" + # echo + # echo -en "${idsCL[LightCyan]}Stopping vCenter services... ${idsCL[Default]}" + # ssh -i ~/.ssh/id_rsa root@vcenter.scity.us 'service-control --stop --all' + # echo -e "${idsCL[Green]}Done${idsCL[Default]}" + # echo -en "${idsCL[LightCyan]}Starting vCenter services... ${idsCL[Default]}" + # ssh -i ~/.ssh/id_rsa root@vcenter.scity.us 'service-control --start --all' + # echo -e "${idsCL[Green]}Done${idsCL[Default]}" + # echo + # echo -e "${idsCL[Green]}The vCenter certifcate has been updated${idsCL[Default]}" } ADD_LOGROTATE_CRONTAB(){