Commit 326e2667 authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Merge branch 'master' into develop

bump version to 0.12.1next

Conflicts:
	version
	version.m4
parents 07e454a4 d3af4a90
2014-01-24, v0.12.1
* Fix a bug affecting import and export scripts
2013-11-04, v0.12
* Add support for OpenBSD and NetBSD images (partition resizing is not
supported yet)
......
......@@ -45,9 +45,9 @@ copyright = u'2011, 2012, 2013 GRNET S.A. All rights reserved'
# built documents.
#
# The short X.Y version.
version = '0.12'
version = '0.12.1'
# The full version, including alpha/beta/rc tags.
release = '0.12'
release = '0.12.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -162,28 +162,30 @@ get_api10_arguments() {
get_api20_arguments() {
get_api10_arguments
local required_osparams="IMG_ID IMG_FORMAT IMG_PASSWD"
local osparams="$required_osparams IMG_PROPERTIES IMG_PERSONALITY CONFIG_URL"
if [ "$SCRIPT_NAME" = "create" ]; then
local required_osparams="IMG_ID IMG_FORMAT IMG_PASSWD"
local osparams="$required_osparams IMG_PROPERTIES IMG_PERSONALITY CONFIG_URL"
# Store OSP_VAR in VAR
for param in $osparams; do
eval $param=\"\$OSP_$param\"
done
if [ -n "$CONFIG_URL" ]; then
local config config_params
echo "Downloading configuration parameters from: \`$CONFIG_URL'" >&2
config=$($CURL -f "$CONFIG_URL")
config_params=$(./decode-config.py $osparams <<< "$config")
eval "$config_params"
fi
# Store OSP_VAR in VAR
for param in $osparams; do
eval $param=\"\$OSP_$param\"
done
for var in $required_osparams; do
if [ -z "${!var}" ]; then
log_error "Missing OS API Parameter: ${var}"
exit 1
if [ -n "$CONFIG_URL" ]; then
local config config_params
echo "Downloading configuration parameters from: \`$CONFIG_URL'" >&2
config=$($CURL -f "$CONFIG_URL")
config_params=$(./decode-config.py $osparams <<< "$config")
eval "$config_params"
fi
done
for var in $required_osparams; do
if [ -z "${!var}" ]; then
log_error "Missing OS API Parameter: ${var}"
exit 1
fi
done
fi
}
map_disk0() {
......
0.12next
0.12.1next
m4_define([devflow_version], [0.12next])
m4_define([devflow_version], [0.12.1next])
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment