Reviewed:  https://review.openstack.org/428519
Committed: https://git.openstack.org/cgit/openstack/diskimage-builder/commit/?id=3f8800832a32ed1523cad6ed5a786141f0a6385a
Submitter: Jenkins
Branch:    feature/v2

commit 83bdfe179a549e9ae3cd61e4f15383f77d668c11
Author: Ian Wienand <email address hidden>
Date:   Tue Jan 31 14:20:09 2017 +1100

    Git ignore coverage stuff
    
    One less piece of clutter when you're trying to merge ...
    
    Change-Id: I794027280359f5d1e02d4f3b99222d35783075d5

commit 11d384e2fa1f550d424f686600d643b3969a40b3
Author: Andrey Shestakov <email address hidden>
Date:   Thu Jan 5 14:39:25 2017 +0200

    Add DIB_IPA_COMPRESS_CMD option
    
    This option allows to specifiy command for compress built initramfs image
    for ironic-agent element. This command can be specified with arguments and
    should read raw data from stdin and write compressed data to stdout.
    Default if "gzip".
    
    Change-Id: I0fdd2ab91d7bf7aaaa6cdd5278e3902d44c5b883

commit ca60b2cf7d30a8978ae9166a23bfee1bca8f6f6a
Author: Ian Wienand <email address hidden>
Date:   Mon Jan 23 14:20:36 2017 +1100

    ironic-agent: use /sbin for modprobe
    
    On redhat/fedora /sbin is a symlink to /usr/sbin, but not on all
    platforms.  This was put in with
    Ibf74dd1b2678ea76e0676711a7aa5ba6b88d5421
    
    Change-Id: I7847b29503c3c07503430a7d85a5364911894c6c
    Closes-bug: #1658297

commit dc8449bf02316f27b556994644f7c4ce18b995a8
Author: Matthew Thode <email address hidden>
Date:   Sun Jan 22 15:53:02 2017 -0600

    move post-install.d to finalize.d
    
    It looks like I installed the cleanup file in the wrong location.  Moving it
    to the correct location and cleaning some more stuff up should allow for a
    much smaller image, currently tested at 300M vs 490M.
    
    Change-Id: I9d0a24b0fe59d4f2d38aa88ba47e4400e0476b46

commit 90a347707c2c0e411052d9d54e00a3380f3e9ce3
Author: Paul Belanger <email address hidden>
Date:   Thu Jan 12 11:55:47 2017 -0500

    Bump fedora release to 25
    
    Now that fedora-25 is released, bump fedora-minimal / fedora elements
    to use it.
    
    Change-Id: Ifdb05255e7a138b99099252fe17041fe4621b6f4
    Depends-On: I3cc467a2d08486458b3f625f94ba969532f6cd04
    Signed-off-by: Paul Belanger <email address hidden>

commit a45ad8eaf56c16c8f77dc8f96fecaf224af4d5bf
Author: Andrey Shestakov <email address hidden>
Date:   Tue Dec 6 23:59:49 2016 +0200

    Fix dhcp-all-interfaces for ubuntu-minimal xenial
    
    The start script of dhcp-all-interfaces currently requires ifup command.
    ifup command provided by package ifupdown, which is not installed in
    ubuntu-minimal Xenial.
    
    This change adds ifupdown package for debian family, as it required for
    dhcp-all-interfaces.
    
    Closes-bug: #1647853
    
    Change-Id: I6dfc0108ec067f350b22e9fb933b9e8d47b09fde

commit 0ceb138d877101542934b7729f9497bc4c9a039a
Author: Ian Wienand <email address hidden>
Date:   Wed Jan 18 08:32:10 2017 +1100

    Don't set base element path in run_functests.sh
    
    DIB automatically includes it's base elements in the ELEMENT_PATH;
    this double-set means the base elements are in the path twice, leading
    to some tools that walk the element list (package-installs-squash, for
    example) to do things twice.
    
    Change-Id: Icf631427601cfd2abed436711cedb9e002fff8f9

commit baf3ced0c32072a5fa525277380a8777fc0a471a
Author: Ian Wienand <email address hidden>
Date:   Wed Jan 18 15:07:46 2017 +1100

    Fix coverage report
    
    There's a few things going on here
    
    Firstly, we need to install coverage tool in test-requirements
    
    Secondly, .testr.conf has to use PYTHON because the coverage report
    works by resetting PYTHON='coverage run ...'
    
    Thirdly, because we call ourselves diskimage-builder but the python
    module is diskimage_builder that seems to confuse things.  We need to
    use "setup.py test" (note, that is different to "setup.py testr"!) to
    use the PBR testr wrapper.  That exposes a --coverage-package-name
    argument that calls the coverage tool with the right argument.
    
    With this I got a coverage report for our unit tests
    
    Change-Id: I9012e18eb7d01bee035140e70afa76c47c27eb01

commit d20754f6ed0b76ebf695c4eadf877edce0536464
Author: Ben Nemec <email address hidden>
Date:   Mon Dec 12 15:46:25 2016 -0600

    Use %i instead of %I in dhcp-interface@.service
    
    Per the bug report, %I results in -'s in the interface name being
    replaced with /'s, which means when we try to look up the interface
    by path in dhcp-all-interfaces.sh we end up at an invalid path.
    Using %i instead should fix the problem.
    
    See https://www.freedesktop.org/software/systemd/man/systemd.unit.html
    
    Essentially what is happening is that we start with a name like
    br-ex that wasn't escaped in the first place.  However, because of
    the - it looks like it could have been escaped to systemd.  When
    we use %I, which tries to unescape escaped values, it unescapes a
    value that was already not escaped.
    
    Change-Id: I434ed2e084d4477dc7a2b7827164586f8ea0c1e3
    Closes-Bug: 1649409

commit 1f43432313950930704f820a723a65320e31f93c
Author: Paul Belanger <email address hidden>
Date:   Fri Dec 23 12:38:07 2016 -0500

    Remove hardcoded components
    
    We can use ${DIB_DEBIAN_COMPONENTS} to get this information. We also
    already set the mirror.
    
    Change-Id: Idd11c2b7df1d247c6d32a5f936b8601b4741b519
    Signed-off-by: Paul Belanger <email address hidden>

commit 6c8d7432a6e9797ed8777770e8d4325b00bf5271
Author: Ian Wienand <email address hidden>
Date:   Fri Nov 25 11:08:11 2016 +1100

    Set grub device in /etc/default/grub
    
    Currently we run grub-mkconfig then go and edit the generated output
    in /boot/grub/grub.cfg to override the "root=" arguments to our label.
    
    If another element like project-config's
    finalise.d/99-fix-grub-timeout then goes and re-runs grub2-install, it
    overwrites these changes.
    
    Grub has GRUB_DEVICE which should override the root device.  Let's try
    using this.  Maybe it wasn't around at the time, this code is
    more-or-less unchanged from I7d83bb2b359e7a8c3858eca04c96e35cf4e1fe9e
    
    Change-Id: Ibaaa81124098f3c6febe48e455d3e1cd0a5f1761

commit ff8ae432653baaf3ee343669d2617e9968acb19f
Author: Luong Anh Tuan <email address hidden>
Date:   Mon Jan 16 15:01:51 2017 +0700

    Replace yaml.load() with yaml.safe_load()
    
    Avoid dangerous file parsing and object serialization libraries.
    yaml.load is the obvious function to use but it is dangerous[1]
    Because yaml.load return Python object may be dangerous if you
    receive a YAML document from an untrusted source such as the
    Internet. The function yaml.safe_load limits this ability to
    simple Python objects like integers or lists.
    
    In addition, Bandit flags yaml.load() as security risk so replace
    all occurrences with yaml.safe_load(). Thus I replace yaml.load()
    with yaml.safe_load()
    
    [1]https://security.openstack.org/guidelines/dg_avoid-dangerous-input-parsing-libraries.html
    
    Change-Id: I84640973fd9f45a69d2b21f6d594cd5bf10660a6
    Closes-Bug: #1634265

commit 022d93ee822e71245af52c4cf8f8a8e82f599af3
Author: Andreas Florath <email address hidden>
Date:   Sat Jan 14 09:35:24 2017 +0000

    Unify tidy up logs in lib/img-functions
    
    Cleaning logs was split, some was done in the
    img-functions.finalise_base, some was done in the base element.
    The version unifies tidy up logs in the lib/img-functions.
    Especially when building docker container images the base element
    cannot be used. This patch removes about some hundreds KB of
    useless logs in cases when the base element is not used.
    
    Change-Id: I165bafb73daf9144c2f3a83930e85e8d8cf5fae3
    Signed-off-by: Andreas Florath <email address hidden>

commit 812ded362dcf042f7eef258ccdae0d1d8aa05334
Author: Ian Wienand <email address hidden>
Date:   Fri Jan 13 15:45:56 2017 +1100

    Also check bin/ for tabs
    
    Add bin/ to dib-lint basic script checks
    
    Change-Id: I92849ab608a6c792d790f041dc7614278c274d30

commit f8eba14d999a236e350e303d900d95174d524258
Author: Bob Fournier <email address hidden>
Date:   Thu Jan 12 10:22:43 2017 -0500

    Handle failure of carrier check in dhcp-all-interfaces.sh
    
    As described in the bug, there are conditions with certain switches
    in which the interface is 'admin down'ed during initialization.
    Doing a 'cat' on /sys/class/net/<interface>/carrier when it is
    'admin down'ed produces an 'Invalid Argument' error and the script
    terminates.  What this fix does is ignore failures of the 'cat'
    operation (by '|| echo 0') and place the link up inside the retry
    loop.
    
    Change-Id: I4f098aa5078b8482681394a3e9a6b17ed4bd4451
    Closes-Bug: 1654046

commit 6c5234e162319f007e9fce03a8b50bd2a3a12c46
Author: Matthew Thode <email address hidden>
Date:   Tue Dec 20 21:49:25 2016 -0600

    Fix Gentoo builds on Ubuntu 16.04 Xenial hosts
    
    Xenial's bind of /dev into the chroot includes /dev/shm which is in
    use by the host.  An alternitive fix for this would be to use rbind
    to recursivly bind mount /dev instead of just the base bind of /dev
    
    Change-Id: I2c0f70afd1e82dd52a522f0dd2b3ea618b30b6c6

commit ccd00b10b2ef7e447f8bcbcad0fa391ba2706271
Author: Ben Nemec <email address hidden>
Date:   Wed Jan 4 11:21:03 2017 -0600

    Make DHCP timeout configurable
    
    As noted in the bug, there may be circumstances where a longer
    timeout than the current default is needed.  This patch allows users
    to tune this timeout for their environment if need be.
    
    Change-Id: I173f3dad684894fbc3c27dece5ae15b5f63bae5a
    Closes-Bug: 1654027

commit 5bed4a6d5e0e037a41931a840c4399e844631cfb
Author: Ben Nemec <email address hidden>
Date:   Wed Jan 4 10:49:59 2017 -0600

    Run dhcp-interface@.service after network.target
    
    When we configure dhcp interfaces before network.target has run,
    network.target will try to bring up those interfaces a second time
    after our service does so.  This causes two issues - first, the
    network target will always fail because it can't bring up an
    interface that is already up, and second, when configuring interfaces
    that don't actually have an available DHCP server it will result in
    a five minute delay waiting for DHCP on those interfaces.  This will
    also cause the network target to fail and is an unnecessary delay.
    
    By moving the dhcp-interface service to run after the network
    target we avoid both of these problems.  network.target will still
    bring up the interfaces on subsequent boots.  This could result in
    the five minute delay happening on reboots, but the expected use
    case for interfaces without DHCP is that they would be configured
    statically on initial deployment so this should be a minor issue.
    
    The dhcp-interface service is also configured to run before the
    network-online target so that services which depend on the network
    actually being available will not race the DHCP process.
    
    A snippet from /var/log/messages on a node with this patch applied
    is included in the bug to demonstrate the behavior described above.
    
    Change-Id: I5cfabf20f920beea52abf4c42362b6f6ac0b37c4
    Closes-Bug: 1653812

commit 197ab47226e0ecfed3e9ffdb0ff0db1ea0d7cb00
Author: Julia Kreger <email address hidden>
Date:   Tue Jan 3 23:34:13 2017 +0000

    Update component docs to refer to ironic-agent
    
    The components documentation was previously referring to the
    ramdisk image for deployment, which was previously deprecated.
    
    Corrected to point to the ironic-agent element.
    
    Change-Id: I770460041eb13523896aaadb7705bdc3db1a54ca

commit 1d4bb048531c8fc77f91c35f5b1ca5756fd52e15
Author: Cady_Chen <email address hidden>
Date:   Thu Dec 22 22:52:17 2016 +0800

    Change "Openstack" to "OpenStack"
    
    According to the word choice convention in
    http://docs.openstack.org/contributor-guide/writing-style/word-choice.html
    We should use OpenStack instead of Openstack.
    
    Change-Id: I66f0bf9eb81593220eb0000fe8192c478e8d075d

commit d6fe34cc59ec6de91f43d2c15b92d82ee1266ebf
Author: Matthew Thode <email address hidden>
Date:   Fri Dec 23 20:02:38 2016 -0600

    update pkg-map entries for python3
    
    Map python3 packages properly, or else we get invalid package names.
    
    Change-Id: I7af8621c856c689840a11d3cb9d094f02a0b9593

commit 7337c9e706985148c988626814830a4768d1f6ba
Author: Andreas Florath <email address hidden>
Date:   Wed Dec 21 20:18:12 2016 +0000

    dib-lint: python3 compatibility fixes
    
    When using up to date distributions for dib development, pep8
    installs using python3.  This patch fixes the problem, that
    not the complete dib-lint (which is called) is compatible
    with python3.
    
    Change-Id: I417d03746edb4d34011b997edf8b5b9662ea6f09
    Signed-off-by: Andreas Florath <email address hidden>

commit f6ecfb3b24448c38d1dea1379077bc804a2987fc
Author: xhzhf <guoyongxhzhf@163.com>
Date:   Wed Dec 21 22:10:50 2016 +0800

    H803 hacking have been deprecated
    
    H803 hacking have been removed.
    https://github.com/openstack-dev/hacking/blob/master/setup.cfg
    Closes-Bug: #1650741
    
    Change-Id: Ic88b431d9260c6e31717b001ff657d10d76b9213

commit 0576d20d49fbbf07d30adc05caca3d749550c06d
Author: Pierre Riteau <email address hidden>
Date:   Wed Dec 21 11:49:27 2016 +0000

    Update documented default Ubuntu version
    
    Since commit fd5fbdd4b5c15c613133c5a18c8e83b486ec1dd0 xenial is the
    version used by default.
    
    Change-Id: I18e01d806635539b2d6c8a4e6b2d25460647c910

commit 2209d343720f994a71d9451c4b9297af969f7bf5
Author: Antoine Musso <email address hidden>
Date:   Tue Dec 6 15:51:12 2016 +0100

    debootstrap: avoid duplicate network configuration
    
    On Debian network configuration can be done via /etc/network/interfaces.
    It can accept a statement to load additional files, which varied in
    history:
    
    Wheezy only supports 'source' (see b822581)
    Jessie supports 'source-directory' and comes with the statement by
    default.
    
    However since 754dd05 we inconditionally inject 'source', thus on Jessie
    the configuration ends up with:
    
     source-directory /etc/network/interfaces.d/*
     source /etc/network/interfaces.d/*
    
    When networking is started, 'ifup -a' parses the list of interfaces
    twice. When configured with dhcp, that causes two dhclient to spawn
    which might conflict with each other.
    
    Inject the source statement only if there is neither a source or
    source-directory with the same path.
    
    Change-Id: Iefa9c9584f676e50481c621b4111eded3125a50b

commit 4585955a8b82889c61deb9ecb34b8713270406a7
Author: Ian Wienand <email address hidden>
Date:   Fri Dec 9 14:41:24 2016 +1100

    Remove yum chroot caching
    
    Every run we are doing a full tar.gz of the chroot environment that
    never gets used.
    
    It's not suitable for CI since we use fresh images each time there.
    
    The cache in general isn't really isn't a very safe thing to have
    around, because there's no invalidation procedure and no real way to
    make one -- we've no guarantee that a new chroot build even moments
    after a previous one wouldn't bring in or different packages, etc (of
    course this is *unlikely*, but the longer you go between builds the
    worse the problem becomes.  Also, tons of packages get installed after
    this not from any cache, so potential speed-up is rather marginal.
    
    Debian turned this off with I58fc485aacacaa17243bf9ce760ed91256d1f182.
    However, given the reasons above and it's complete lack of testing, I
    don't see this as useful.
    
    If we really want this type of thing, I think we should come up with a
    way to use a persistent external yum/dnf cache that yum/dnf keeps in
    sync with it's usual invalidation rules.
    
    Change-Id: I66789c35db75c41bc45ea1ad2e26f87456de4e4d

commit 6a40b607176857dc599ce9ca69da12b9bc1c6560
Author: Gregory Haynes <email address hidden>
Date:   Tue Dec 6 16:08:28 2016 -0800

    Create ubuntu/fedora test for pip-and-virtualenv
    
    This element does some funky stuff WRT python2 vs python3 so lets get
    some multi-distro testing in place.
    
    Change-Id: I1e3c3bfa0a109419d4cbee7fa32a18392b7e1a93

commit 8e3e66dfbd139f0180b40d73e1f65ff237a280d1
Author: Ian Wienand <email address hidden>
Date:   Tue Dec 13 12:47:46 2016 +1100

    Speed up chroot checking loop
    
    It was noticed on a very busy system this can take about 1s per loop.
    This starts to add up on thousands of processes.
    
    Firstly, prune out all the kernel threads.  Then introduce a very
    small inline python script to find any pids that seem to be in the
    chroot without forking to examine each one.  After that the existing
    loop just kills anything as before.
    
    Change-Id: Icc7bc7eda80ffcd636f97e6542d70c220e9c225e

commit cd1965f7b7e5d6a7ce31fdb816af00ad93166d5d
Author: Gregory Haynes <email address hidden>
Date:   Thu Dec 8 15:30:56 2016 -0800

    Allow disto-specific mirror settings
    
    Most of our distros support DIB_DISTRIBUTION_MIRROR for setting the
    mirror to be used when building. This has a major downside where if
    someone would like to create a static configuration for building various
    distro images it cannot set DIB_DISTRIBUTION_MIRROR (think of the case
    where we want to run our tests).
    
    By adding support for DIB_$DISTRO_DISTRIBUTION_MIRROR this problem is
    resolved.
    
    Change-Id: I92964b17ec3e47cf97e3a3091f054b2a205ac768

commit cb3e1076e31319aaea12108eb259bfa129be344f
Author: Aparna <email address hidden>
Date:   Thu Nov 10 11:21:44 2016 +0000

    Update hpssacli to ssacli in proliant-tools element
    
    This commit updates the CLI utility name hpssacli to
    ssacli  as part of company name change from HP to HPE.
    ssacli will work seamlessly for all the cases where
    hpssacli is used.
    
    It also updates the custom URL location for ssacli
    utility with new location.
    
    Change-Id: I2de4d3430e7308d25e36dc6960783699aa17dfae

commit 828f9279c0d3b7a5fc9377c768c0711a3dac92a2
Author: Andreas Florath <email address hidden>
Date:   Sat Jul 16 14:52:30 2016 +0200

    Spec for changing the block device handling: partitioning
    
    During the creation of a disk image (e.g. for a VM), there is the need
    to create, setup, configure and afterwards detach some kind of storage
    where the newly installed OS can be copied to or directly installed
    in.
    
    This document describes the details of partitioning.
    
    Change-Id: I72d8459e81d7da7a8feaebbf295d6c436a686a07
    Signed-off-by: Andreas Florath <email address hidden>