Renaming NOS to Director
Moving PLUMgrid Director parameters to the common
configuration function

Fix bug #1198281

Change-Id: I5231950121cfaac9d2d8cc58c4e7b904ccaa9dce
Source linuxbridge_agent in linuxbridge plugin

devstack neutron lib needs to find some functions named
'neutron_plugin_configure_XXXXXX' in the neutron plugin lib
Part of them are usually in the plugin agent file.

For linuxbridge plugin some of theses functions are missing.
This change load the linuxbridge_agent file in linuxbridge file to make
missing functions available to neutron lib when linux bridge plugin is used.

Fix bug #1195237

Change-Id: I567bedc84e77c041e9418773fba1f74b33bcf604
clean logical volumes in init_cinder

This part of code was forgotten when _clean_volume_group()
has been renamed.

Change-Id: I96fe749013b5cf1fd3411b2ba661302873e92994
Move swift stuff out of keystone-data.sh

- Fixes bug 1199918.

Change-Id: I808bdd74a94c8e0ca126b9bee1bfd53eafa189a9
xenapi: Exit immediately if zipball download fails

If install_os_domU.sh fails to download the Xapi plugins zipball
correctly it ignores the error and continues the installation.
This could damage the hypervisor's filesystem, as it may delete
files or overwrite them with garbage.

Change-Id: I9f6dc31b977592e2818e37b2d310c2a5dc477364
Fixes: bug #1195640
Add integration bridge to the nova.conf

This is needed when running the compute service with
vSphere as virt backend, and Neutron as networking
solution.

Fixes bug #1200677

Change-Id: Iff01559be437d1409c13224574458d23a1edd1a4
QPID default host

Using SERVICE_HOST as a default QPID_HOST.

Change-Id: I65df0ea4be7df37d4d6f22591b175870808a5c84
Merge "xenapi: Exit immediately if zipball download fails"
Merge "Source linuxbridge_agent in linuxbridge plugin"
Merge "Renaming NOS to Director Moving PLUMgrid Director parameters to the common configuration function"
Merge "Add integration bridge to the nova.conf"
Merge "QPID default host"
Merge "clean logical volumes in init_cinder"
Merge "Move swift stuff out of keystone-data.sh"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp