Commit 8f8450f7 authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Merge branch 'hotfix-0.16.2' into debian-hotfix-0.16.2

parents c3e9e66b c05d8b9f
2014-10-14, v0.16.2
* Fix a bug in img_properties handling introduced in v0.16.1
* Update the documentation
2014-10-13, v0.16.1 2014-10-13, v0.16.1
* Add an option for controlling pithcat's umask * Add an option for controlling pithcat's umask
* HELPER: prevent configuration tasks from running if no image property * HELPER: prevent configuration tasks from running if no image property
......
...@@ -80,6 +80,10 @@ some external programs in ``/etc/default/snf-image``: ...@@ -80,6 +80,10 @@ some external programs in ``/etc/default/snf-image``:
# PITHOS_ARCHIPELAGO_CONF: Archipelago configuration file # PITHOS_ARCHIPELAGO_CONF: Archipelago configuration file
# PITHOS_ARCHIPELAGO_CONF="/etc/archipelago/archipelago.conf" # PITHOS_ARCHIPELAGO_CONF="/etc/archipelago/archipelago.conf"
# PITHCAT_UMASK: If set, it will change the file mode mask of the pithcat
# process to the specified one.
# PITHCAT_UMASK=<not set>
# PROGRESS_MONITOR: External program that monitors the progress of the image # PROGRESS_MONITOR: External program that monitors the progress of the image
# deployment. The snf-image monitor messages will be redirected to the standard # deployment. The snf-image monitor messages will be redirected to the standard
# input of this program. # input of this program.
......
__version__ = "0.16.1" __version__ = "0.16.2"
...@@ -100,7 +100,7 @@ fi ...@@ -100,7 +100,7 @@ fi
if [ $(set | { grep ^SNF_IMAGE_PROPERTY_ || true; } | wc -l) -eq 0 ]; then if [ $(set | { grep ^SNF_IMAGE_PROPERTY_ || true; } | wc -l) -eq 0 ]; then
warn "No image properties are defined. VM configuration will not be performed." warn "No image properties are defined. VM configuration will not be performed."
export $SNF_IMAGE_PROPERTY_EXCLUDE_ALL_TASKS=yes export SNF_IMAGE_PROPERTY_EXCLUDE_ALL_TASKS=yes
fi fi
if [ -z "$SNF_IMAGE_PROPERTY_EXCLUDE_ALL_TASKS" ]; then if [ -z "$SNF_IMAGE_PROPERTY_EXCLUDE_ALL_TASKS" ]; then
......
...@@ -45,22 +45,6 @@ check_required() { ...@@ -45,22 +45,6 @@ check_required() {
exit 1 exit 1
fi fi
done done
case $IMG_FORMAT in
extdump|ntfsdump)
;;
diskdump)
if [ -z "$IMG_PROPERTIES" ]; then
log_error "\`img_properties' parameter must be present when"
log_error "using \`diskdump' format."
exit 1
fi
;;
*)
log_error "Unknown Image format: \`$IMAGE_TYPE'"
exit 1
;;
esac
} }
if [ -z "$OSP_CONFIG_URL" ]; then if [ -z "$OSP_CONFIG_URL" ]; then
......
m4_define([devflow_version], [0.16.1]) m4_define([devflow_version], [0.16.2])
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