Merge "Devstack support for Neutron VPNaaS"
Merge "Do not modify rsyslog files if rsyslog is not used."
Don't use deprecated nova libvirt conf names

libvirt_cpu_mode was renamed to libvirt.cpu_mode
libvirt_type was renamed to libvirt.virt_type

This patch is needed before I346ee0248c03e60716bd7dc4a5ee4493610867cb can
land.

Change-Id: Ie8a39147ece3a3c86f4b146fa0af3641b1079319
Don't set nova.conf values to there default value

No need to set osapi_compute_extension and volume_api_class to there
default values.

Change-Id: I1f5345fa2e0ac3a3fbb96a63f36207d2233d7837
add Fedora x86_64 image for nodepool

Change-Id: I54fdc81e2a233fdcf90534aff6be7984e28f6133
Rename ironic option drivers_whitelist -> enabled_drivers

There were competing patches to implement this feature in Ironic.

Patch I2da37409cea98731a2ca18dfe7298861fde37783 calls the option
'enabled_drivers', which is more consistent with other option names.

Change-Id: Ifa7eae594c6d9ea743a17b4c31e407501bba8467
VMware: update to latest cirros image

The default image used is cirros 0.3.0, which is out-dated and
does not support cloud-init for config drive.  By upgrading to
0.3.2, we gain config drive support testing in our tempest runs.

Change-Id: Ibe7f70f1fb457d210b891b19ba3b5be94b2343f0
Also pass FWAAS conf to VPN agent if enabled

If q-vpn is enabled, the Neutron neutron-vpn-agent is started
instead of the neutron-l3-agent, but only neutron-l3-agent receives
the fwaas_driver config when q-fwaas is enabled.  This ensures the FW driver
config is passed to either so that a properly configured agent is running
when the FWAAS extensions are enabled.

Closes-bug: #1310858

Change-Id: I237d2831a6b87ae46dfef047d3dc0b85fa6423d3
lib/tempest: $HEAT_CREATE_TEST_IMAGE is not used anymore

Ridiculous patch to remove a not true anymore code comment. If
one wants to have Devstack get a heat compatible image, one
should add HEAT_FETCHED_TEST_IMAGE=Fedora-i386-20-20131211.1-sda
in his localrc

Change-Id: I2702a322fe1332be5c1301bb32710288ec683350
Fix Sahara auth configs

* auth_ host/port/protocol should use corresponding $KEYSTONE_AUTH_
* add missed auth_ host/port/protocol to [keystone_authtoken]

Change-Id: I0fc6434d552cdd03eb8d886681e57bb374e5bb61
Merge "VMware: update to latest cirros image"
Merge "Fixed pip with http(s)_proxy"
Merge "Rename ironic option drivers_whitelist -> enabled_drivers"
Merge "Don't set nova.conf values to there default value"
Add "daemon" flag to marconi script

This patch adds daemon flag to marconi script. This change was
needed to run the latest build of marconi-server in background.
Since mongodb can not be used with marconi until gate is updated
to Ubuntu 14.04, we are changing our backend to sqlite.

Change-Id: I1a4148bd545818d5e943257be2f6e752ce43f793
Fix ceilometer-acompute rejoin problems

The problem was in the screenrc file generated, where the
following command appeared:

sg libvirtd "ceilometer-agent-compute
                 --config-file /etc/ceilometer/ceilometer.conf"^M"

The final "^M" was not then parsed.

Change-Id: Ie6c5b1c9e3d196a3a9c343c2afb46435711c10f5
Closes-bug: #1311666
Add bridge_mappings to extras/80-opendaylight.sh to support vlan isolation.

OpenDaylight integration with Openstack requires some extra configuration
information to be set in the ovsdb via the other_config value. Currently
only the local ip address is set. bridge_mappings needs to be added to support
vlan isolation.

This requires changing the form of the existing ovs-vsctl command to set
the other_config value. The current command does a replace so the last
command to run overwrites any other values. The command is changed to
append values instead.

Change-Id: Ia001ecf27c8f5ace05af014ecce0b13f6d490ac1
Merge "Fix Sahara auth configs"
Merge "Add missing function neutron_plugin_configure_service to brocade specific file"
Merge "Add "daemon" flag to marconi script"