Set default fixed_ip quota to unlimited.

DocImpact: our previous default quota of ten was poorly thought through
and resulted in upgrade problems. Instead, let's have operators opt into
fixed IP quotas. This change should be mentioned in release notes please.

Resolves bug 1161190.

Change-Id: I2f066a0129461899fe330a628cf49ee5273eaba4
'injected_files' should be base 64 encoded.

If an instance build needs to be rescheduled, send the original
base 64 encoded injected_files parameter.

bug 1161479

Change-Id: I4dad95e95cd27f7f128989daa36b3a2bbf132c73
(cherry picked from commit f6af4f753676088318b3944e9e41d698950093d9)
Fix automatic confirmation of resizes for no-db-compute

compute/api.py:confirm_resize() was still making a bunch of calls
against the database that were tripping over the no-db-compute
enforcement checks. Instead of trying to unwind all of the instance
action, quota, etc code and divert to conductor, just farm out the
entire confirm_resize() call to conductor.

Fixes bug 1161402

Change-Id: I121040a3b575f5866d45cc8ef6862d67f5558715
(cherry picked from commit ec75cc2a6bc6e3f367b3377515cb9c4b99a6ab29)
Sync in matchmaker and qpid Conf changes from oslo

The following should use integers not strings.
* matchmaker_heartbeat_freq
* matchmaker_heartbeat_ttl
* qpid_port

Fixes bug 1159889 and bug 1161679

Change-Id: I2f055929ffa48ead300d2a3efdb0ce0692a13716
(cherry picked from commit 94783b2158e9b92d40974b9bb0738426e2162066)
Merge "Fix automatic confirmation of resizes for no-db-compute" into milestone-proposed
quantum security group driver nova list shows same group

When using the quantum security group driver nova list shows the
same security group for all instances. This patch fixes this and
corrects the unit test that was hiding this bug. This also adds a unit test
to check that the default security group is added to the response when
not specified.

Fixes bug  1162077

Change-Id: I7a10f81af1bb6c93f634dc0de27841afe0f1f0ea
Merge "Sync in matchmaker and qpid Conf changes from oslo" into milestone-proposed
Bump stable/grizzly next version to 2013.1.1

Change-Id: I22b294efd8c168d4fde27855034ac4accdbf9ba6
fix2
libvirt
extend
Cleanup Sheepdog VDIs
Cleanup Sheepdog VDIs 2
fix 3
Collie snapshot tag fix
f***g find_disk
strongly conceptual fix
fix 4
Merge remote-tracking branch 'origin/stable/grizzly' into iteco