Merge branch 'master' of git://github.com/openstack-dev/devstack into opendaylight
On openSUSE, qemu-tools provides qemu-img

Change-Id: I6ab0b7dd871acd6103b15b5fe10350667b72d1a8
manage-vdi: Wait until devices have been created before mounting

kpartx creates partition devices asynchronously - it may exit before
the devices have been created.  This may cause a subsequent mount call
to fail, because the device it is trying to mount does not yet exist.
kpartx now has a -s option which makes it wait for the devices to be
created before returning, but the version XenServer's dom0 doesn't have
this option.   Work around this by retrying the mount.

When dom0's kpartx is updated, we will be able to use the -s option.

Change-Id: I823a8eac4f3a2ef313d06e21da0f38ed46d7386a
Set external ID on br-ex

This will enable Neurtron identify that the external bridge is a
Neutron bridge (this is required for bug 1192883)

Change-Id: I8ad1b0b3d93d5068beec2021abf9afbacf8c48ff
make rejoin-stack.sh keep the same service tags

Currently rejoin-stack.sh can not keep the same screen service tags
as the first you deploy openstack due to that the stack-screenrc lack
proper command to configure screen's hardstatus. just delete the old
stack-screenrc so that function screen_rc can write proper initialize
command into stack-screenrc.

fix bug 1182597

Change-Id: I4cb4c6ded93a5c7b0bd39d65a754ddf86553463d
Merge branch 'master' of git://github.com/openstack-dev/devstack into opendaylight
Set external_network_bridge for the test configuration file

Fixes bug #1203210
Supports blueprint nvp-third-party-support

Change-Id: I21d769b552d31fe099f2773c919e0c7b471399fc
Merge "make rejoin-stack.sh keep the same service tags"
Merge "Set external_network_bridge for the test configuration file"
Merge "On openSUSE, qemu-tools provides qemu-img"
Merge "Set external ID on br-ex"
Update neutron_available config option.

Tempest change I5ee9ec816845de483fe88d76d1bb047e7bb1af7e changed
the behavior of the neutron_available config option. This commit
updates devstack to use it's new name and group.

Change-Id: I7d5074209fe81f6100f380512d7702fbc8e252ac
Update README for swift off by default

Change 11277b1f3cfa850c074d3effbb43987b6e6e6391 disabled swift due to
port conflicts but the documentation still states that it is enabled
by default, which can be quite confusing.

While we're there, wrap affected lines to 80 chars.

Change-Id: I9d543f3368bdadadae482c163d814065009ab395
Use vmware section

The vmware configurations are now in a specific vmware section.

Change-Id: I283b36bd023a43800852f792dd7fd8adf4d6ac84
Set service_available config options in tempest

This commit loops over the list of services that tempest has config
options for in the service_available group and checks if the service
is enabled. Devstack will then set whether or not the service is
configured in tempest.conf.

Change-Id: Ib845d3e098fd3f45c8c26f5696af14cca1534e01
xenapi: Setup and Rotate text console logs

This patch installs the cronjob that rotates/sets up the text console
logs of the guests.

Related to blueprint xenapi-server-log

Change-Id: Ie4c778b54f69519fbb80aa0d9822383f55a1e2f9
Remove unused parameter from lbaas_agent.ini

That makes devstack installation script consistent with latest
change in neutron lbaas_agent

Change-Id: I7946301a7fb4adddb5911575cbdfaf6b024132e3
Remove python-netaddr requirement

Remove python-netaddr as a DevStack (stack.sh) requirement,
this does not change any individual project requirements.

Specifically it replaces address_in_net() and adds cidr2netmask()
and maskip() functions.

Change-Id: Ic604437fde2e057faced40a310ab282f3eb27726
Merge "Remove python-netaddr requirement"
make install_heatclient like other client installs

all the other install_*client functions do the setup develop
inline. Do the same thing for heat.

Change-Id: Ib2043580af6b7f14f24f7304e5f47f4523517d06