openstack
/
magnum
Code Issues Proposed changes

Merge "Devstack: Fix typo of MANGUM_GUEST_IMAGE_URL"

This commit is contained in:
Jenkins 2015-12-30 07:54:49 +00:00 committed by Gerrit Code Review
parent 88d63e32de 3a72a28096
commit ea114e14df
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/lib/magnum
View File

@ -235,16 +235,16 @@ function init_magnum {
function magnum_register_image {
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
magnum_image_property=$magnum_image_property"fedora-atomic"
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
magnum_image_property=$magnum_image_property"ubuntu"
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

4
devstack/plugin.sh
View File

@ -18,8 +18,8 @@ if is_service_enabled m-api m-cond; then
# add image to glance
if [[ "$ENABLED_SERVICES" =~ 'm-api' ]]; then
MANGUM_GUEST_IMAGE_URL=${MANGUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-21-atomic-5.qcow2"}
IMAGE_URLS+=",${MANGUM_GUEST_IMAGE_URL}"
MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-21-atomic-5.qcow2"}
IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
fi
LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"