Commit 1953cfab authored by Nikos Skalkotos's avatar Nikos Skalkotos

Merge branch 'master' into develop

parents f9fa7979 1da38b9d
2016-01-28, v0.19
* Support Windows XP/2003 (windows-legacy OSFAMILY)
* Support 32-bit versions of Windows
* Add new os_product_key and os_answer_file OS parameters
* Allow offline resizing for NTFS
* Cleanup the default Unattend.xml file
* Allow defining the Windows time zone in the default Unattend.xml file
* Add new image configuration task that executes user defined code
* Allow the image itself to overwrite configuration tasks that run
during deployment when the image is mounted
* Support Ed24419 ssh keys
* Support making swap in secondary disk
* Strip down the helper kernel (reduces helper image size)
* Support Debian Jessie helpers
* Fix bugs and cleanup the code
* Update the documentation
2015-03-13, v0.18.1
* HELPER: Fix a bug in ConfigureNetwork task that caused a syntax error
if the SUBNET was missing for a NIC
2015-03-03, v0.18
* HELPER: Auto-detect OSFAMILY and ROOT_PARTITION properties if missing
* HELPER: Add new CofigureNetwork image configuration task
......
......@@ -159,13 +159,13 @@ All image formats properties
* For Windows images, the *Administrator*'s password is reset.
* For Linux and \*BSD images, the *root* password is reset.
* **DO_SYNC=yes**
* **DO_SYNC=bool**
By default in ResizeUnmounted task, when ``resize2fs`` is executed to
enlarge a ext[234] file system, ``fsync()`` is disabled to speed up the
whole process. If for some reason you need to disable this behavior, use the
*DO_SYNC* image property.
* **IGNORE_UNATTEND=yes**
* **IGNORE_UNATTEND=bool**
When deploying a Windows image, the InstallUnattend configuration task will
install an Answer File for Unattended Installation (the one shipped with
*snf-image* or the one pointed out by the *UNATTEND* configuration
......@@ -175,14 +175,14 @@ All image formats properties
exists in the above-mentioned location. For more information on "answer
files" please refer to :ref:`windows-deployment`.
* **ALLOW_MOUNTED_TASK_OVERWRITING=yes**
* **ALLOW_MOUNTED_TASK_OVERWRITING=bool**
If this property is defined with yes, then the presence of an executable
file under */root/snf-image/helper/overwrite_task_<TASK>* inside the image
will make *snf-image* execute the code hosted there instead of the default
one. See :ref:`Overwriting Configuration Tasks<overwriting-configuration-tasks>`
for more info.
* **OFFLINE_NTFSRESIZE=yes**
* **OFFLINE_NTFSRESIZE=bool**
When deploying a Windows Image, perform an offline NTFS resize, instead of
setting up the Unattend.xml file so SYSPREP executes a custom DISKPART
script to perform an online resize during the first boot. Note NTFS is left
......@@ -191,7 +191,7 @@ All image formats properties
disable this behavior (this is dangerous). For more information on "answer
files" please refer to :ref:`windows-deployment`.
* **OFFLINE_NTFSRESIZE_NOCHECK=yes**
* **OFFLINE_NTFSRESIZE_NOCHECK=bool**
Set this property to yes to skip the NTFS check performed by Windows upon
the first boot when performing an offline NTFS resize (see the
*OFFLINE_NTFSRESIZE* property). Skipping the initial filesystem check is
......@@ -228,23 +228,23 @@ All image formats properties
you want to write a custom configuration task check
:ref:`Configuration Tasks Environment<configuration-tasks-environment>`.
* **EXCLUDE_ALL_TASKS=yes**
* **EXCLUDE_ALL_TASKS=bool**
If this property is defined with a yes value, the image will not be
configured at all, during the deployment. This is really handy because it
gives the ability to deploy images hosting operating systems whose
configuration is not supported by *snf-image*.
* **EXCLUDE_MOUNTED_TASKS=yes**
* **EXCLUDE_MOUNTED_TASKS=bool**
If this property is defined, then only the tasks that are meant to run
before the VM's disk gets mounted (namely *FixPartitionTable* and
*FilesystemResizeUmounted*) will be allowed to run during deployment.
* **EXCLUDE_FilesystemResize_TASKS=yes**
* **EXCLUDE_FilesystemResize_TASKS=bool**
If this property is defined with a yes value, the 3 filesystem resize tasks
(*FilesystemResizeUnmounted*, *FilesystemResizeMounted*,
*FilesystemResizeAfterUmount*) will be prevented from running.
* **EXCLUDE_TASK_<task_name>=yes**
* **EXCLUDE_TASK_<task_name>=bool**
This family of properties gives the ability to exclude individual
configuration tasks from running. Hence, if the property
*EXCLUDE_TASK_DeleteSSHKeys* with a value other than null is passed to
......@@ -257,6 +257,10 @@ All image formats properties
will probably end up with an unsuccessful deployment because B will fail and
exit in an abnormal way. You can read more about configuration tasks here.
.. note:: All boolean properties are treated as follows: yes is assumed to be
either yes, true, 1, on, and set while no is assumed to be no, false, 0, off,
and unset. An empty or not-set property is treated as false.
img_properties OS parameter
+++++++++++++++++++++++++++
......
......@@ -11,22 +11,22 @@ following images are basic installations of some popular Linux distributions,
that have been tested with *snf-image* and provided here for testing purposes:
* Debian Wheezy Base System
[`diskdump <https://cdn.synnefo.org/debian_base-7.0-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/debian_base-7.0-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/debian_base-7.0-x86_64.diskdump.meta>`_]
* Debian Desktop
[`diskdump <https://cdn.synnefo.org/debian_desktop-7.0-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/debian_desktop-7.0-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/debian_desktop-7.0-x86_64.diskdump.meta>`_]
* Debian Jessie Base System
[`diskdump <https://cdn.synnefo.org/debian_base-8.0-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/debian_base-8.0-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/debian_base-8.0-x86_64.diskdump.meta>`_]
* Debian Jessie Desktop
[`diskdump <https://cdn.synnefo.org/debian_desktop-8.0-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/debian_desktop-8.0-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/debian_desktop-8.0-x86_64.diskdump.meta>`_]
* CentOS 7.x
[`diskdump <https://cdn.synnefo.org/centos-7-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/centos-7-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/centos-7-x86_64.diskdump.meta>`_]
* Fedora Desktop 21
[`diskdump <https://cdn.synnefo.org/fedora-21-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/fedora-21-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/fedora-21-x86_64.diskdump.meta>`_]
* Fedora Desktop 23
[`diskdump <https://cdn.synnefo.org/fedora-23-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/fedora-23-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/fedora-23-x86_64.diskdump.meta>`_]
* Ubuntu Desktop LTS 14.04
[`diskdump <https://cdn.synnefo.org/ubuntu_desktop-14.04-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/ubuntu_desktop-14.04-x86_64.diskdump.md5sum>`_]
......@@ -39,22 +39,18 @@ that have been tested with *snf-image* and provided here for testing purposes:
[`diskdump <https://cdn.synnefo.org/opensuse_desktop-13.2-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/opensuse_desktop-13.2-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/opensuse_desktop-13.2-x86_64.diskdump.meta>`_]
* Oracle Linux 6.x
[`diskdump <https://cdn.synnefo.org/oraclelinux-6-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/oraclelinux-6-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/oraclelinux-6-x86_64.diskdump.meta>`_]
* FreeBSD 10.0
[`diskdump <https://cdn.synnefo.org/freebsd-10.0-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/freebsd-10.0-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/freebsd-10.0-x86_64.diskdump.meta>`_]
* OpenBSD 5.5
[`diskdump <https://cdn.synnefo.org/openbsd-5.5-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/openbsd-5.5-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/openbsd-5.5-x86_64.diskdump.meta>`_]
* NetBSD 6.1
[`diskdump <https://cdn.synnefo.org/netbsd-6.1-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/netbsd-6.1-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/netbsd-6.1-x86_64.diskdump.meta>`_]
* Oracle Linux 7.x
[`diskdump <https://cdn.synnefo.org/oraclelinux-7-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/oraclelinux-7-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/oraclelinux-7-x86_64.diskdump.meta>`_]
* FreeBSD 10.2
[`diskdump <https://cdn.synnefo.org/freebsd-10.2-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/freebsd-10.2-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/freebsd-10.2-x86_64.diskdump.meta>`_]
* NetBSD 7.0
[`diskdump <https://cdn.synnefo.org/netbsd-7.0-x86_64.diskdump>`_]
[`md5sum <https://cdn.synnefo.org/netbsd-7.0-x86_64.diskdump.md5sum>`_]
[`metadata <https://cdn.synnefo.org/netbsd-7.0-x86_64.diskdump.meta>`_]
Sample Usage
^^^^^^^^^^^^
......
__version__ = "0.18.1next"
__version__ = "0.19"
# Copyright (C) 2011-2016 GRNET S.A.
# Copyright (C) 2011-2016 GRNET S.A. and individual contributors
# Copyright (C) 2007, 2008, 2009 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
......@@ -29,6 +29,8 @@ TAR="tar"
DATE="date -u" # Time in UTC
KVM="kvm"
MD5SUM="md5sum"
BLOCKDEV="blockdev"
DD="dd"
# Temporary use stderr as monitoring file descriptor.
# `create' will overwrite this
......@@ -227,7 +229,7 @@ create_floppy() {
target=$(mktemp -d)
add_cleanup rmdir "$target"
dd bs=512 count=2880 if=/dev/zero of="$img"
$DD bs=512 count=2880 if=/dev/zero of="$img"
mkfs.ext2 -F "$img" > /dev/null
mount "$img" "$target" -o loop
......
......@@ -175,9 +175,9 @@ if [ "$BACKEND_TYPE" = "local" ]; then
# Deploying an image file on a target block device is a streaming copy
# operation. Enable the direct I/O flag on the output fd to avoid polluting
# the host cache with useless data.
$monitor dd bs=4M if="$image_file" of="$target" oflag=direct iflag=fullblock
$monitor $DD bs=4M if="$image_file" of="$target" oflag=direct iflag=fullblock
else
$image_cmd | $monitor dd bs=4M of="$target" oflag=direct iflag=fullblock
$image_cmd | $monitor $DD bs=4M of="$target" oflag=direct iflag=fullblock
fi
report_info "Image copy finished."
......
......@@ -142,3 +142,5 @@
# TIMEOUT="timeout"
# CURL="curl"
# TAR="tar"
# BLOCKDEV="blockdev"
# DD="dd"
#!/bin/bash
# Copyright (C) 2012 GRNET S.A.
# Copyright (C) 2012-2016 GRNET S.A. and individual contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -35,10 +35,10 @@ fi
# Export disk's predicted size to Ganeti.
# Used to provide a time estimate of the export process to the user.
if [ -n "$EXP_SIZE_FD" ]; then
blockdev --getsize64 "$blockdev" >&$EXP_SIZE_FD
$BLOCKDEV --getsize64 "$blockdev" >&$EXP_SIZE_FD
fi
dd if="$blockdev" bs=4M
$DD if="$blockdev" bs=4M
# Execute cleanups
cleanup
......
#!/bin/bash
# Copyright (C) 2012 GRNET S.A.
# Copyright (C) 2012-2016 GRNET S.A. and individual contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -32,7 +32,7 @@ if [ ! -b "$blockdev" ]; then
add_cleanup $LOSETUP -d "$blockdev"
fi
dd of="$blockdev" bs=4M
$DD of="$blockdev" bs=4M
# Execute cleanups
cleanup
......
m4_define([devflow_version], [0.18.1next])
m4_define([devflow_version], [0.19])
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