From 081e94b93fbf2a92c4def7381ebf1bc5e697e31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= Date: Mon, 19 Mar 2018 15:33:36 +0100 Subject: [PATCH] Change release URLs to Flatcar's Signed-off-by: Dongsu Park --- contrib/create-coreos-vdi | 10 +++++----- oem/generic/check_etag.sh | 2 +- oem/openstack/glance_load.sh | 4 ++-- oem/oracle/launch-instance | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/create-coreos-vdi b/contrib/create-coreos-vdi index 05a54db653..dede8e0283 100755 --- a/contrib/create-coreos-vdi +++ b/contrib/create-coreos-vdi @@ -52,15 +52,15 @@ WORKDIR="${DEST}/tmp.${RANDOM}" mkdir "$WORKDIR" trap "rm -rf '${WORKDIR}'" EXIT -RAW_IMAGE_NAME="coreos_production_image.bin" +RAW_IMAGE_NAME="flatcar_production_image.bin" IMAGE_NAME="${RAW_IMAGE_NAME}.bz2" DIGESTS_NAME="${IMAGE_NAME}.DIGESTS.asc" case ${VERSION_ID} in - stable) BASE_URL="https://stable.release.core-os.net/amd64-usr/current" ;; - alpha) BASE_URL="https://alpha.release.core-os.net/amd64-usr/current" ;; - beta) BASE_URL="https://beta.release.core-os.net/amd64-usr/current" ;; - *) BASE_URL="https://alpha.release.core-os.net/amd64-usr/${VERSION_ID}" ;; + stable) BASE_URL="https://stable.release.flatcar-linux.net/amd64-usr/current" ;; + alpha) BASE_URL="https://alpha.release.flatcar-linux.net/amd64-usr/current" ;; + beta) BASE_URL="https://beta.release.flatcar-linux.net/amd64-usr/current" ;; + *) BASE_URL="https://alpha.release.flatcar-linux.net/amd64-usr/${VERSION_ID}" ;; esac IMAGE_URL="${BASE_URL}/${IMAGE_NAME}" diff --git a/oem/generic/check_etag.sh b/oem/generic/check_etag.sh index f1f29aaeaa..60d8c24c9d 100755 --- a/oem/generic/check_etag.sh +++ b/oem/generic/check_etag.sh @@ -15,7 +15,7 @@ release=${1:-"alpha"} # If the argument is in the form http* allow for watching an arbitrary location if [[ $1 != http* ]]; then - url="https://${release}.release.core-os.net/amd64-usr/current/version.txt" + url="https://${release}.release.flatcar-linux.net/amd64-usr/current/version.txt" else url=$1 release=$(echo ${url} | sed -e 's/http:\/\///1' -e 's/\//-/g' ) diff --git a/oem/openstack/glance_load.sh b/oem/openstack/glance_load.sh index 0af21ba593..162753bf6e 100755 --- a/oem/openstack/glance_load.sh +++ b/oem/openstack/glance_load.sh @@ -21,7 +21,7 @@ while [[ $# -gt 0 ]]; do # For this convoluded trick, we take an arbitrary URL, chop it # up, and try to turn it into usable input for the rest of the # script. This is based on urls of the form: - # https://storage.core-os.net/coreos/amd64-usr/master/version.txt + # https://storage.flatcar-linux.net/coreos/amd64-usr/master/version.txt # where the following sed expression extracts the "master" # portion baseurl="${1%/*}" @@ -46,7 +46,7 @@ while [[ $# -gt 0 ]]; do done if [[ -z "${baseurl}" ]]; then - baseurl="https://${release}.release.core-os.net/${board}/current" + baseurl="https://${release}.release.flatcar-linux.net/${board}/current" fi version_url="${baseurl}/version.txt" diff --git a/oem/oracle/launch-instance b/oem/oracle/launch-instance index 03f47e293c..9af275c9e8 100755 --- a/oem/oracle/launch-instance +++ b/oem/oracle/launch-instance @@ -14,7 +14,7 @@ shape="VM.Standard1.1" ipxe=0 ignition= keyfile="$HOME/.ssh/id_rsa.pub" -baseurl="http://alpha.release.core-os.net/amd64-usr/current" +baseurl="http://alpha.release.flatcar-linux.net/amd64-usr/current" bucket_base="users.developer.core-os.net/$USER/bmcs" kargs=