summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge "Alter output format of volume types resources"Jenkins2012-02-224-18/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Alter output format of volume types resourcesBrian Waldon2012-02-214-18/+24
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * volumes types lists now fit in with the rest of our API * Fixes bug 934435 Change-Id: Ia67318be363230fcb2819c0df976b44f19dd0876
* | | | | | | | | Merge "blueprint host-aggregates: xenapi implementation"Jenkins2012-02-2215-112/+749
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blueprint host-aggregates: xenapi implementationArmando Migliaccio2012-02-2115-112/+749
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces some clean-up/improvements on the current model and api for host aggregates. It also introduces a first version of the xenapi implementation. More precisely: - it lays out the structure of the virt driver, - it introduces compute and xenapi unit tests coverage, - it deals with join/eject of pool master and slaves, - it fixes xenapi_conn, when used in resource pool configurations More commits to follow (to ensure that VM placement, networking setup, performance metrics work just as well in cases where resource pools are present). However, these may be outside the scope of this blueprint and considered as ad-hoc bug fixes. Change-Id: Ib3cff71160264c5547e1c060d3fd566ad87337cb
* | | | | | | | | Merge "Avoid copying file if dst is a directory."Jenkins2012-02-221-11/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid copying file if dst is a directory.Rick Harris2012-02-211-11/+14
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 938153 `shutil.move` in Python 2.4 will fallback to copying the file if dst is a directory. See http://bugs.python.org/issue1577. Change-Id: I2390337d82db5a72fef0e63877401134b1dcca55
* | | | | | | | | Merge "Fix error that causes 400 in flavor create."Jenkins2012-02-222-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix error that causes 400 in flavor create.Anthony Young2012-02-212-5/+7
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes bug 938212 * Fix style per bcwaldon's comment Change-Id: I5c4a024c29634f1b786a36ca93050b9f2de41dea
* | | | | | | | | Merge "Extract get_network in quantum manager"Jenkins2012-02-222-24/+83
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Extract get_network in quantum managerAaron Lee2012-02-212-24/+83
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To aid understanding, testing and refactoring allocate_for_instance update: rebase update: rebase and trailingslashectomy Change-Id: I85364b925082ec598c1645c33f3db4a25f3242a8
* | | | | | | | Merge "Update api-paste.ini with new auth_token settings."Jenkins2012-02-211-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Update api-paste.ini with new auth_token settings.Dan Prince2012-02-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update api-paste.ini with new 'admin_user' and 'admin_password' settings for the keystone auth_token middleware. By default username and password are options commented out. Fixes LP bug #930310. Change-Id: I04f91df5641d377d52c9578cade131bce5bfd4a4
* | | | | | | | | Merge "Don't inherit controllers from each other, we don't want the methods ↵Jenkins2012-02-211-10/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of our parent"
| * | | | | | | | | Don't inherit controllers from each other, we don't want the methods of our ↵Justin Santa Barbara2012-02-181-10/+8
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parent Bug #934478 Change-Id: I6871b42b00db2ce7d9345204cba1cc778bf04e58
* | | | | | | | | Merge "Support tox-based unittests."Jenkins2012-02-215-8/+53
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Support tox-based unittests.Monty Taylor2012-02-205-8/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a0a616a979688595762e6b772d77a14f1968070
* | | | | | | | | Exception cleanupJoe Gordon2012-02-218-14/+14
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not write "except:", use "except Exception:" at the very least Change-Id: I539c013132309791f18c46819232102e9232e917
* | | | | | | | Merge "Improve unit test coverage per bug/934566."Jenkins2012-02-202-10/+92
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve unit test coverage per bug/934566.Michael Still2012-02-182-10/+92
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug/934566 identified an error which should have been caught by more complete unit test coverage. This review extends unit test coverage and is one of a series I will be sending. Change-Id: I76b966fc2bf18940d0dc0475f3776f8a3148a78d
* | | | | | | | Stop ignoring E202.Monty Taylor2012-02-203-3/+3
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is absolutely no reason to ignore E202 in the pep8 checks. Change-Id: I4abf767639dd94e9e8b7b4a405b4a702a554b876
* | | | | | | Merge "Fix broken method signiture"Jenkins2012-02-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix broken method signitureTomoe Sugihara2012-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GET on a network in os-networks API would fail because of the signiture mismatch. This fixes the issue. Change-Id: I4865e93a6a2ad26aa4abcc78b1056152c2b59369
* | | | | | | | Merge "Escape apostrophe in utils.xhtml_escape() (lp#872450)"Jenkins2012-02-203-4/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Escape apostrophe in utils.xhtml_escape() (lp#872450)Nick Bartos2012-02-203-4/+6
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove comment which is no longer relevant. Change-Id: I33a951d08a34510b2a9dbacb9fb3ebf6bee978b4
* | | | | | | Merge "Don't tell Qpid to reconnect in a busy loop."Jenkins2012-02-201-7/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Don't tell Qpid to reconnect in a busy loop.Russell Bryant2012-02-191-7/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 929784. Don't set any of the reconnect timing options unless they have been set in the configuration. Setting them all to zero puts Qpid in a mode where it will reconnect in a busy loop. By not setting these unless a non-zero value has been provided, Qpid goes back to its default behavior, which is to use an exponential backoff on reconnect attempts (after 1 second, then 2, 4, 8, etc). Change-Id: Ia587bbe96db9ea6e429af289c3d586f4c6706648
* | | | | | Merge "Backslash continuations (nova.virt.baremetal)"Jenkins2012-02-203-30/+30
|\ \ \ \ \ \
| * | | | | | Backslash continuations (nova.virt.baremetal)Zhongyue Luo2012-02-103-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #929998 Backslash continuations removal for package nova.virt.baremetal Change-Id: I74beb27b5f5f13fbd6a391a2dc8acf2834846066
* | | | | | | Merge "Backslash continuations (nova.tests)"Jenkins2012-02-2028-334/+319
|\ \ \ \ \ \ \
| * | | | | | | Backslash continuations (nova.tests)Zhongyue Luo2012-02-1728-334/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #925285 Backslash continuations removal for package nova.tests Change-Id: I089dfb9a06a807e58ebb21329800a4eff40ed2bb
* | | | | | | | Merge "Add additional information to servers output."Jenkins2012-02-205-0/+227
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add additional information to servers output.Anthony Young2012-02-175-0/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improves cloud debugability, by letting admins see on which host a server has been launched * Addresses blueprint optional-host-and-admin-information * Add test * Rebase to master, fix tests accordingly Change-Id: Iba173ca3b1ead716e274f1d287cebbc7961d8a93
* | | | | | | | Merge "Support non-UTC timestamps in changes-since filter"Jenkins2012-02-205-7/+132
|\ \ \ \ \ \ \ \
| * | | | | | | | Support non-UTC timestamps in changes-since filterEoghan Glynn2012-02-175-7/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes nova aspect of lp 837464 Prevously only Zulu time was supported in the changes-since filter, i.e. timestamps formatted as %Y-%m-%dT%H:%M:%SZ We now support arbitrary timezones, with the offset from UTC expressed via the ISO 8601 ±hh:mm notation. Microsecond accurracy is also optionally supported in timestamps. Notes: - nova.utils.parse_isotime(), isotime() & normalized_time() are prime candidates for promotion to openstack-common, as these methods were duplicated from my corresponding glance patch: https://review.openstack.org/#change,4198 - this patch introduces a new dependency on python-iso8601, which has already been packaged for Fedora, EPEL and Ubuntu/Debian. Change-Id: I89b45f4f3d910606c578d927420f78cea94f4e3b
* | | | | | | | | Merge "nova.conf sample tool"Jenkins2012-02-205-2/+176
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | nova.conf sample toolZhongyue Luo2012-02-185-2/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #918621 A tool to generate a sample nova.conf file Change-Id: I2646d7e674ef3d1759558e820f051cc5e7f3b4ae
* | | | | | | | | | Handle OSError which can be thrown when removing tmpdir. Fixes bug 883326.chris fattarsi2012-02-192-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie1f40fcce6ce6af4ab71961c725dcd626eda8aea
* | | | | | | | | | Imported Translations from LaunchpadOpenStack Jenkins2012-02-1919-8687/+9126
| |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d6b7a7f3ec11089289fcbd6f41a1c5d77f7f20f
* | | | | | | | | Merge "Setting access ip values on server create."Jenkins2012-02-184-3/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Setting access ip values on server create.Naveed Massjouni2012-02-184-3/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id67c5e9d7bb00227e88ecbc2ffb0e772fcd69066
* | | | | | | | | | Merge "Imported Translations from Launchpad"OpenStack Jenkins2012-02-1819-25298/+123308
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Imported Translations from LaunchpadOpenStack Jenkins2012-02-1719-25298/+123308
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7c1a081afd51fa48868ae26271615a8a6f11412
* | | | | | | | | | Merge "Add ephemeral storage to flavors api."Jenkins2012-02-186-11/+228
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add ephemeral storage to flavors api.Anthony Young2012-02-176-11/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds flavor.ephemeral to compliment flavor.disk * Fixes bug 932928 Change-Id: Ic15a9094aa6c27fda24deabd7df8633ce61c984b
* | | | | | | | | | | Merge "Add support for admin_password to LibVirt"Jenkins2012-02-183-8/+136
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add support for admin_password to LibVirtMike Pittaro2012-02-173-8/+136
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the config flag --libvirt_inject_password is set, Libvirt now makes an attempt to inject the admin_password to instances at startup time. Fixes bug 767202 Change-Id: I1491c84825bf0bbad43a7d53b379271caa2b76f6
* | | | | | | | | | | Merge "Resolve bug/934566."Jenkins2012-02-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve bug/934566.Michael Still2012-02-181-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I09934034527367e731d9ba09dcb860922e2b5017
* | | | | | | | | | | Merge "fix pre_block_migration() interaction with libvirt cache"Jenkins2012-02-181-17/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix pre_block_migration() interaction with libvirt cachePádraig Brady2012-02-171-17/+12
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 932179 * nova/virt/libvirt/connection (pre_block_migration): Don't pass the 'ephemeral_gb' attribute as the size, since this has the wrong units and is the wrong quantity to pass anyway. Also don't check for file existence, or create the cow image as this is done within _cache_image() Change-Id: Id723ec8d119dacd4660e88e546e05af417c736fc