Compare commits
1 Commits
6b35d42d97
...
e50206725e
Author | SHA256 | Date | |
---|---|---|---|
e50206725e |
@@ -12,6 +12,7 @@ if [ -d "/tmp/ironic-certificates" ]; then
|
||||
CERTS_CHANGED=1
|
||||
else
|
||||
CERTS_CHANGED=0
|
||||
fi
|
||||
fi
|
||||
|
||||
# Which image should we use
|
||||
@@ -45,26 +46,26 @@ else
|
||||
# If we have a CACHEURL and nothing has yet been downloaded
|
||||
# get header info from the cache
|
||||
ls -l
|
||||
if [ -n "$CACHEURL" -a ! -e $FFILENAME.headers ] ; then
|
||||
if [ -n "$CACHEURL" ] && [ ! -e $FFILENAME.headers ] ; then
|
||||
curl -g --verbose --fail -O "$CACHEURL/$FFILENAME.headers" || true
|
||||
fi
|
||||
|
||||
# Download the most recent version of IPA
|
||||
if [ -e $FFILENAME.headers ] ; then
|
||||
ETAG=$(awk '/ETag:/ {print $2}' $FFILENAME.headers | tr -d "\r")
|
||||
cd $TMPDIR
|
||||
curl -g --verbose --dump-header $FFILENAME.headers -O $IPA_BASEURI/$FFILENAME --header "If-None-Match: $ETAG" || cp /shared/html/images/$FFILENAME.headers .
|
||||
cd "$TMPDIR"
|
||||
curl -g --verbose --dump-header $FFILENAME.headers -O "$IPA_BASEURI/$FFILENAME" --header "If-None-Match: $ETAG" || cp /shared/html/images/$FFILENAME.headers .
|
||||
# curl didn't download anything because we have the ETag already
|
||||
# but we don't have it in the images directory
|
||||
# Its in the cache, go get it
|
||||
ETAG=$(awk '/ETag:/ {print $2}' $FFILENAME.headers | tr -d "\"\r")
|
||||
if [ ! -s $FFILENAME -a ! -e /shared/html/images/$FILENAME-$ETAG/$FFILENAME ] ; then
|
||||
if [ ! -s $FFILENAME ] && [ ! -e "/shared/html/images/$FILENAME-$ETAG/$FFILENAME" ] ; then
|
||||
mv /shared/html/images/$FFILENAME.headers .
|
||||
curl -g --verbose -O "$CACHEURL/$FILENAME-$ETAG/$FFILENAME"
|
||||
fi
|
||||
else
|
||||
cd $TMPDIR
|
||||
curl -g --verbose --dump-header $FFILENAME.headers -O $IPA_BASEURI/$FFILENAME
|
||||
cd "$TMPDIR"
|
||||
curl -g --verbose --dump-header $FFILENAME.headers -O "$IPA_BASEURI/$FFILENAME"
|
||||
fi
|
||||
|
||||
if [ -s $FFILENAME ] ; then
|
||||
@@ -74,21 +75,22 @@ else
|
||||
ARCH=$(file -b ${FILENAME}.kernel | cut -d ' ' -f 3)
|
||||
if [ "$ARCH" = "x86" ]; then
|
||||
ARCH="x86_64"
|
||||
fi
|
||||
ETAG=$(awk '/ETag:/ {print $2}' $FFILENAME.headers | tr -d "\"\r")
|
||||
cd -
|
||||
chmod 755 $TMPDIR
|
||||
mv $TMPDIR $FILENAME-$ETAG
|
||||
ln -sf $FILENAME-$ETAG/$FFILENAME.headers $FFILENAME.headers
|
||||
ln -sf $FILENAME-$ETAG/$FILENAME.initramfs $FILENAME-${ARCH,,}.initramfs
|
||||
ln -sf $FILENAME-$ETAG/$FILENAME.kernel $FILENAME-${ARCH,,}.kernel
|
||||
chmod 755 "$TMPDIR"
|
||||
mv "$TMPDIR" "$FILENAME-$ETAG"
|
||||
ln -sf "$FILENAME-$ETAG/$FFILENAME.headers" "$FFILENAME.headers"
|
||||
ln -sf "$FILENAME-$ETAG/$FILENAME.initramfs" "$FILENAME-${ARCH,,}.initramfs"
|
||||
ln -sf "$FILENAME-$ETAG/$FILENAME.kernel" "$FILENAME-${ARCH,,}.kernel"
|
||||
|
||||
IMAGE_CHANGED=0
|
||||
else
|
||||
rm -rf $TMPDIR
|
||||
rm -rf "$TMPDIR"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${CERTS_CHANGED:-1}" = "0" -a "${IMAGE_CHANGED:-1}" = "0" ]; then
|
||||
if [ "${CERTS_CHANGED:-1}" = "0" ] && [ "${IMAGE_CHANGED:-1}" = "0" ]; then
|
||||
mkdir -p /tmp/ca/tmp-initrd && cd /tmp/ca/tmp-initrd
|
||||
mkdir -p etc/ironic-python-agent.d/ca-certs
|
||||
cp /tmp/ironic-certificates/* etc/ironic-python-agent.d/ca-certs/
|
||||
|
Reference in New Issue
Block a user