summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Use system M2Crypto package on Oneiric, bug 892271Adrian Smith2011-12-061-0/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Ubuntu Oneiric has a problem with the pip installed version of m2crypto. This fix installs python-m2crypto via apt-get on Oneiric. Change-Id: I8290a74b614eb0d0b8d620dbad19d2cc6843de8b
* | | | Merge "Remove remnants of babel i18n infrastructure"Jenkins2011-12-062-25/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove remnants of babel i18n infrastructureMark McLoughlin2011-12-062-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | We use distutils-extra now instead of babel. Change-Id: I10625cc4ef2ac8eefd46ee09e36f8cfaef85061f
* | | | Update compute manager so that finish_revert_resize runs on the sourceDan Prince2011-12-061-1/+1
| |_|/ |/| | | | | | | | | | | | | | compute host. Fixes bug #900849. Change-Id: I838604a5c623a3970ce36cdb3d12279812eb8401
* | | Merge "Pass '-r' option to 'collie cluster status'."Jenkins2011-12-061-1/+4
|\ \ \
| * | | Pass '-r' option to 'collie cluster status'.François Charlier2011-12-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'collie cluster status' default output is more verbose since sheepdog 0.24. The '-r' (raw) option has been added for less verbose output but won't be used to ensure compatibility with pre-0.24 sheepdog. Change-Id: Ie31bdded928772250515e439016fc5c5beb00d83
* | | | Merge "Remove autogenerated pot file"Jenkins2011-12-062-2788/+1
|\ \ \ \
| * | | | Remove autogenerated pot fileJulien Danjou2011-12-062-2788/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25c33e2a91458d2eaa41232eb54b2c1e4e273854 Signed-off-by: Julien Danjou <julien.danjou@enovance.com>
* | | | | Merge "Add NAT/gateway support to QuantumManager"Jenkins2011-12-064-20/+70
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add NAT/gateway support to QuantumManagerBrad Hall2011-11-294-20/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blueprint quantum-nat-parity This also sets up the rest of the forwarding rules (metadata, etc) Change-Id: I73b8eb99803d7cb05147e71f3b09375a420ec926
* | | | | Merge changes Ia6debb64,I31786a20Jenkins2011-12-061-26/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | * changes: Adding an install_requires to the setup call. Now you can pip install nova on a naked machine. Removing obsolete bzr-related clauses in setup.py
| * | | | Adding an install_requires to the setup call. Now you can pip install nova ↵Ben McGraw2011-11-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on a naked machine. Change-Id: Ia6debb6422be2769efbc6628e760f23dbf5099dc
| * | | | Removing obsolete bzr-related clauses in setup.pyBen McGraw2011-11-281-26/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I31786a20c85ad65f340627320f6f5bf3c4e08d79
* | | | | Merge "remove duplicate netaddr in nova/utils"Jenkins2011-12-061-1/+0
|\ \ \ \ \
| * | | | | remove duplicate netaddr in nova/utilsJoe Gordon2011-12-051-1/+0
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: Ib9b7ddc619ce62010b5661579fe32cc55b68f7e6
* | | | | Merge "Make admin_password keyword in compute manager run_instance method ↵Jenkins2011-12-061-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | match what we send in the compute API. Fixes bug #900591."
| * | | | Make admin_password keyword in compute manager run_instance method matchDan Prince2011-12-051-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | what we send in the compute API. Fixes bug #900591. Change-Id: I857b7787189d454e8ed17a43654d6bf944da003e
* / / / Fixes a typo preventing attaching RBD volumes.François Charlier2011-12-063-2/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | A typo in spelling 'rbd' as 'rdb' prevents attaching RBD volumes to instances. Fixes bug 900359. Change-Id: I872369a21b5935c37c4299f3f748d2d133a78bb3
* | | cleanup: remove .bzrignoreJoe Gordon2011-12-051-19/+0
| | | | | | | | | | | | Change-Id: I87ba2a419322c4746c61be114997b5bc86a3bab2
* | | Merge "Document nova-tarball Jenkins job."Jenkins2011-12-051-1/+6
|\ \ \
| * | | Document nova-tarball Jenkins job.Lorin Hochstein2011-12-021-1/+6
| | | | | | | | | | | | | | | | Change-Id: I1034cceaa4fa3aa66e54fd082a078f802bc27baf
* | | | Merge "Add availabity_zone to the refresh list"Jenkins2011-12-051-2/+7
|\ \ \ \
| * | | | Add availabity_zone to the refresh listJoseph W. Breu2011-12-021-2/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The availability_zone column for a service record is not updated if the availability_zone is changed after the record was created. This patch adds availability_zone to the update list in report_state if the availability_zone stored in the database does not match the local flag Change-Id: I869384af113517adfba3a675f757e51687b3c15e
* | | | Merge "Implement resize down for XenAPI"Jenkins2011-12-0515-197/+334
|\ \ \ \
| * | | | Implement resize down for XenAPIJohannes Erdfelt2011-12-0215-197/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements resizing an instance to a smaller disk. It implements this by copying the VDI and running e2resize, before transferring to the new host. Change-Id: Ic901a59cb6cdb79605c70528cf85064d8335ee2f
* | | | | Merge "Bug #896997: nova-vncproxy's flash socket policy port is not ↵Jenkins2011-12-053-9/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | configurable"
| * | | | | Bug #896997: nova-vncproxy's flash socket policy port is not configurableEwan Mellor2011-11-293-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add flags called vncproxy_flash_socket_policy_port and vncproxy_flash_socket_policy_host, to allow the admin to configure the Flash socket policy listener. Change-Id: If42839ccd86f1c8723221049d7c76b6f5ad0aa2d
* | | | | | Merge "EC2 rescue/unrescue is broken, bug 899225"Jenkins2011-12-056-15/+42
|\ \ \ \ \ \
| * | | | | | EC2 rescue/unrescue is broken, bug 899225Alex Meade2011-12-026-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a0b9c08a43e8c606d1c885cf7f47382fa4664a8
* | | | | | | Merge "add index to instance_uuid column in instances"Jenkins2011-12-052-1/+31
|\ \ \ \ \ \ \
| * | | | | | | add index to instance_uuid column in instancesTrey Morris2011-12-052-1/+31
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I4d5313cfbd97eba7bd755567a0bed9b65adb14dc
* | | | | | | Add missing documentation for shared folder issue with unit tests and PythonDuncan McGreggor2011-12-052-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock file. Addresses documentation need raised in bug 897155 Change-Id: Idc95c12f939948bbbefd84a79b3785e3c2fd752c
* | | | | | | Merge "Adds extension documentation for some but not all extensions"Jenkins2011-12-0512-0/+1251
|\ \ \ \ \ \ \
| * | | | | | | Adds extension documentation for some but not all extensionsannegentle2011-12-0212-0/+1251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I187483ccacd9c29c1c414fbf8481ead23f9c457a
* | | | | | | | Updated nova-manage to work with uuid imagesGhe Rivero2011-12-053-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 899299 Change-Id: Ib0be692503b8761a5600902a1e0d7a4dc371a680
* | | | | | | | Merge "Bug #898290: iSCSI volume backend treats FLAGS.host as a hostname"Jenkins2011-12-052-5/+15
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Bug #898290: iSCSI volume backend treats FLAGS.host as a hostnameEwan Mellor2011-11-302-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change ISCSIDriver to set volume.provider_location during create_export. This records the location of the LUN, so that nova-compute does not need to run the iSCSI discovery code itself. As part of this, include the IP address of the target (--iscsi_ip_address) in the provider_location. This means that we don't use volume's host identifier (which could be an opaque ID) when trying to connect to the iSCSI target -- we use the admin-specified IP address instead. The string-join to set provider_location is shared with ZadaraBEDriver, which was doing something similar. I've brought that into a helper function. The docstring for the --host flag has been clarified. Change-Id: I8402da86345e786a46a4d222ad4d8a4449d2bd3f
* | | | | | | | Merge "Better exception handling during run_instance"Jenkins2011-12-021-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Better exception handling during run_instanceMark Washenberger2011-12-021-2/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I46700315022ef83a7f5f8fca517b126b95c16060
* | | | | | | Merge "Add templates for selected resource extensions."Jenkins2011-12-0213-39/+554
|\ \ \ \ \ \ \
| * | | | | | | Add templates for selected resource extensions.Kevin L. Mitchell2011-12-0213-39/+554
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to bug 852141; adds XML serialization and deserialization for the following extensions: * FlavorExtraSpecs (os-flavor-extra-specs) * Floating_ips (os-floating-ips) * Hosts (os-hosts) * Keypairs (os-keypairs) * Quotas (os-quota-sets) Change-Id: I96ace8252f8f77612ab8c866e03eff8faee2c12b
* | | | | | | | Merge "Fix for EC2 API part of bug 897164"Jenkins2011-12-025-16/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix for EC2 API part of bug 897164Jimmy Bergman2011-12-025-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96344eaccd2f42b70223b3c155a4793ab00d09d5
* | | | | | | | Merge "Remove some unused imports from db"Jenkins2011-12-021-2/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove some unused imports from dbMark McLoughlin2011-12-021-2/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ipv6 unused since commit 82804eb4 (Remove VIF<->Network FK dependancy) auth unused since commit 3b9af8a6 (pull out auth manager from db) Change-Id: I5aca9d9c6dbcf0263000341b9a2566430af1674e
* | | | | | | Merge "Updates simple scheduler to allow strict availability_zone scheduling"Jenkins2011-12-022-1/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Updates simple scheduler to allow strict availability_zone schedulingJoseph W. Breu2011-12-012-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This update adds strict availability_zone scheduling of new instances when an availabity_zone option is not present in the creation call. This patch does not change the expected default behavior. Previous behavior was to default the zone to None and only update the zone in the scheduler if an availability_zone was supplied. This incorrectly allowed the scheduler to place new instances created without an availability_zone onto compute nodes where the availability_zone had been changed to something other than the default of 'nova'. Setting default_schedule_zone to 'nova' will prevent new instance scheduling into availability_zones other than the default 'nova' zone. This change defaults the zone to None but allows the user to override this with the default_schedule_flag. In practice, if you have 2 availability_zones (nova, megazone) you can configure default_schedule_zone on the API node to 'nova' and any instances created will be created into the 'nova' availability_zone if one was not supplied. Instances created with an availability_zone will be created as normal into the availability_zone supplied. Change-Id: Id23bac8448ea7ce6a1e1227d046c921328dbfe33
* | | | | | | Merge "Replacing instance id's in in xenapi.vmops and the xen plugin with ↵Jenkins2011-12-022-31/+34
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | instance uuids. The only references to instance id's left are calls to the wait_for_task() method. I will address that in another branch. blueprint: internal-uuids"
| * | | | | | Replacing instance id's in in xenapi.vmops and the xen plugin withNaveed Massjouni2011-12-022-31/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instance uuids. The only references to instance id's left are calls to the wait_for_task() method. I will address that in another branch. blueprint: internal-uuids Change-Id: I268706f2429e47195a97054187ff7da8c55e3719
* | | | | | | Merge "Fix to correctly report memory on Linux 3.X."Jenkins2011-12-021-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |