openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use local cirros image if available"

Browse Source
This commit is contained in:
Zuul 2018-02-27 05:18:54 +00:00 committed by Gerrit Code Review
commit 378b8dd932
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/init-runonce
View File

@ -6,6 +6,7 @@
# to be created. # to be created.
ARCH=$(uname -m) ARCH=$(uname -m)
IMAGE_PATH=/opt/cache/files/
IMAGE_URL=http://download.cirros-cloud.net/0.4.0/ IMAGE_URL=http://download.cirros-cloud.net/0.4.0/
IMAGE=cirros-0.4.0-${ARCH}-disk.img IMAGE=cirros-0.4.0-${ARCH}-disk.img
IMAGE_NAME=cirros IMAGE_NAME=cirros
@ -45,9 +46,17 @@ if openstack image list | grep -q cirros; then
exit exit
fi fi
echo Downloading glance image. echo Checking for locally available cirros image.
if ! [ -f "${IMAGE}" ]; then # Let's first try to see if the image is available locally
curl -L -o ./${IMAGE} ${IMAGE_URL}/${IMAGE} # nodepool nodes caches them in $IMAGE_PATH
if ! [ -f "${IMAGE_PATH}/${IMAGE}" ]; then
IMAGE_PATH='./'
if ! [ -f "${IMAGE_PATH}/${IMAGE}" ]; then
echo None found, downloading cirros image.
curl -L -o ${IMAGE_PATH}/${IMAGE} ${IMAGE_URL}/${IMAGE}
fi
else
echo Using cached cirros image from the nodepool node.
fi fi
EXTRA_PROPERTIES= EXTRA_PROPERTIES=
@ -57,7 +66,7 @@ fi
echo Creating glance image. echo Creating glance image.
openstack image create --disk-format qcow2 --container-format bare --public \ openstack image create --disk-format qcow2 --container-format bare --public \
--property os_type=${IMAGE_TYPE} ${EXTRA_PROPERTIES} --file ./${IMAGE} ${IMAGE_NAME} --property os_type=${IMAGE_TYPE} ${EXTRA_PROPERTIES} --file ${IMAGE_PATH}/${IMAGE} ${IMAGE_NAME}
echo Configuring neutron. echo Configuring neutron.
openstack network create --external --provider-physical-network physnet1 \ openstack network create --external --provider-physical-network physnet1 \