Devstack: Fix typo of MANGUM_GUEST_IMAGE_URL
s/MANGUM_GUEST_IMAGE_URL/MAGNUM_GUEST_IMAGE_URL Closes-Bug: #1529786 Change-Id: I1dc5c6f5fff9fc1507d4b346c72a928c87297c3f
This commit is contained in:
parent
a859b00596
commit
3a72a28096
|
@ -235,16 +235,16 @@ function init_magnum {
|
||||||
function magnum_register_image {
|
function magnum_register_image {
|
||||||
local magnum_image_property="--property os_distro="
|
local magnum_image_property="--property os_distro="
|
||||||
|
|
||||||
local atomic="$(echo $MANGUM_GUEST_IMAGE_URL | grep -o 'atomic' || true;)"
|
local atomic="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -o 'atomic' || true;)"
|
||||||
if [ ! -z $atomic ]; then
|
if [ ! -z $atomic ]; then
|
||||||
magnum_image_property=$magnum_image_property"fedora-atomic"
|
magnum_image_property=$magnum_image_property"fedora-atomic"
|
||||||
fi
|
fi
|
||||||
local ubuntu="$(echo $MANGUM_GUEST_IMAGE_URL | grep -o "ubuntu" || ture;)"
|
local ubuntu="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -o "ubuntu" || ture;)"
|
||||||
if [ ! -z $ubuntu ]; then
|
if [ ! -z $ubuntu ]; then
|
||||||
magnum_image_property=$magnum_image_property"ubuntu"
|
magnum_image_property=$magnum_image_property"ubuntu"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT --os-image-api-version 1 image set $(basename "$MANGUM_GUEST_IMAGE_URL" ".qcow2") $magnum_image_property
|
openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT --os-image-api-version 1 image set $(basename "$MAGNUM_GUEST_IMAGE_URL" ".qcow2") $magnum_image_property
|
||||||
}
|
}
|
||||||
|
|
||||||
# install_magnumclient() - Collect source and prepare
|
# install_magnumclient() - Collect source and prepare
|
||||||
|
|
|
@ -18,8 +18,8 @@ if is_service_enabled m-api m-cond; then
|
||||||
|
|
||||||
# add image to glance
|
# add image to glance
|
||||||
if [[ "$ENABLED_SERVICES" =~ 'm-api' ]]; then
|
if [[ "$ENABLED_SERVICES" =~ 'm-api' ]]; then
|
||||||
MANGUM_GUEST_IMAGE_URL=${MANGUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-21-atomic-5.qcow2"}
|
MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-21-atomic-5.qcow2"}
|
||||||
IMAGE_URLS+=",${MANGUM_GUEST_IMAGE_URL}"
|
IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"
|
LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"
|
||||||
|
|
Loading…
Reference in New Issue