summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | Remove db session hack from conductor's vol_usage_update()Dan Smith2013-06-184-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3cf4cb2534c387f287f118d4185d54b1435d3bc0 made the vol_usage_update() in conductor hack around a stale sqlalchemy object issue by keeping session active in the current context until the notification was completed. This layering violation led to some "creative" tests to try to verify this behavior. This removes that and refreshes the object before letting it out of the db/api layer so that all the attributes are present, thus avoiding the dynamic load during notification. Change-Id: Ia6ef5cb7f462ff72d170f3af33f2d020ee4d3e3c
* | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Initial scheduler support for instance_groups""Jenkins2013-06-207-158/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Revert "Initial scheduler support for instance_groups"Russell Bryant2013-06-207-158/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b2c17ae891b12118b9d11bf0ecc44e77956715c8. While reviewing merged changes, I came across this one. It's using the conductor in a way that it shouldn't. The scheduler has db access, so there's no need to add the extra conductor overhead. The best thing to do here is to just revert for now, IMO. Change-Id: Iaa0d67df7bb84913784d925cffebcd5f252249ea
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove a layer of nesting in _poll_unconfirmed_resizes()"Jenkins2013-06-201-56/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Remove a layer of nesting in _poll_unconfirmed_resizes()Dan Smith2013-06-191-56/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simply changes the logic atop _poll_unconfirmed_resizes() and de-indents everything that was nested underneath by four spaces. It makes it much easier to work on without the useless extra level of nesting. Change-Id: I0d65fe2d1fc2649e0527ecbed1e6682b3da52b2b
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use InstanceList for _heal_instance_info_cache()"Jenkins2013-06-202-13/+16
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Use InstanceList for _heal_instance_info_cache()Dan Smith2013-06-192-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes _heal_instance_info_cache() use InstanceList for the all-by-host query. Related to blueprint unified-object-model Change-Id: I93872a35ff249bbeb7d02bfe54a7d83676aa447a
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove straggling use of all-kwarg object methods"Jenkins2013-06-202-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Remove straggling use of all-kwarg object methodsDan Smith2013-06-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes one remaining vestige of the days of yore when nova developers were forced to always use kwargs on object methods out of fear, lest it be used over RPC. Related to blueprint unified-object-model Change-Id: Ieba76efc2f5daed08e4bde9096c0e178f1f44466
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "fixes nova resize bug when force_config_drive is set."Jenkins2013-06-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | fixes nova resize bug when force_config_drive is set.Anthony Woods2013-06-201-1/+1
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If files is None, set contents=[] when calling instance_metadata.InstanceMetadata from within _create_image() to prevent the method trying to iterate a NoneType. Fixes bug 1183003 Change-Id: I0ac18ad5363ab9496fa83d231d7ec7c59d737691
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "xenapi: revisit error handling around calls to agent"Jenkins2013-06-204-110/+185
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | xenapi: revisit error handling around calls to agentJohn Garbutt2013-06-194-110/+185
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we have settings to hint if the agent is present or not, and by default we do not check for the agent, if the agent is not responding to our calls for its version, we can fail the build. In environments that need the agent to inject the networking, you really want the agent to fail if it is not present. If the agent did not inject the networking, the server will have no networking. However, we can still leave the agent upgrade to silently fail, as the agent should be backwards compatible. fixes bug 1188540 Change-Id: I8acdabd8d2bd24b088dad3cd4abec300d0ada3fb
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Initial scheduler support for instance_groups"Jenkins2013-06-207-25/+158
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Initial scheduler support for instance_groupsGary Kotton2013-06-167-25/+158
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scheduler support for blueprint instance-group-api-extension The patch set adds the following: 1. conductor support for getting instances via the instance_group uuid 2. conductor support for removing an instance from the instance_group members In addition to this it replaces the 'group' hint with 'instance_group'. DocImpact Change-Id: I4a4febc2e85d4ffc8b1579d2673fa107171a3c5b
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Adding fixed_ip in create.end notification"Jenkins2013-06-202-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Adding fixed_ip in create.end notificationKaushik Chandrashekar2013-06-142-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending the network information for an instance in the create.end notification. Fixes bug 1185076 Change-Id: Iabe088ed23736d7b1ee97624761445023aab22c2
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add err_msg param to baremetal_deploy_helper."Jenkins2013-06-201-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add err_msg param to baremetal_deploy_helper.Dan Prince2013-06-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the baremetal-deploy-helper so that we look for an option 'e' POST parameter which contains an optional error message string from the agent. This works with the associated DIB branch here: http://review.openstack.org/#/c/33341/ And is also fully backwards compatible with existing agent scripts which do not send the 'e' parameter. Change-Id: I9a5914e719c2db6d2ae6d002cd386a0e48fda18d
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Sync oslo-incubator gettextutils"Jenkins2013-06-201-0/+176
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Sync oslo-incubator gettextutilsMatt Odden2013-06-191-0/+176
| | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change brings in new functionality from gettextutils needed for supporting API message localization in Nova. bp user-locale-api Change-Id: Ia81f46bb980a237f345f6b8600dfe2a75e4b8c77
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add old display name to update notification"Jenkins2013-06-202-5/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add old display name to update notificationWangpan2013-06-172-5/+17
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add old display name to payload of update notification when it is changed, so the notification consumer could know the display name is changed which is the same as task_state. Fixes bug 1191612 Change-Id: I47b8ad8ffc2988212b59fb141e83b8110994b8da
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-2039-14802/+15031
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-1939-14802/+15031
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I451c6702924f36b91aa1177fc22c2815367669de
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Drop `bm_pxe_ips` table from baremetal database."Jenkins2013-06-208-261/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Drop `bm_pxe_ips` table from baremetal database.Victor Sergeyev2013-06-148-261/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added migration and tests - removed model `BareMetalPxeIp` - from nova/virt/baremetal/db/sqlalchemy/api.py removed functions `bm_pxe_ip_get_all`, `bm_pxe_ip_create`, `bm_pxe_ip_create_direct`, `bm_pxe_ip_destroy`, `bm_pxe_ip_destroy_by_address`, 'bm_pxe_ip_get`, `bm_pxe_ip_get_by_bm_node_id`, `bm_pxe_ip_associate`, 'bm_pxe_ip_disassociate` - from nova/virt/baremetal/db/api.py removed functions `bm_node_associate_and_update`, `bm_pxe_ip_create`, `bm_pxe_ip_create_direct`, `bm_pxe_ip_destroy`, `bm_pxe_ip_destroy_by_address`, `bm_pxe_ip_get_all`, `bm_pxe_ip_get`, `bm_pxe_ip_get_by_bm_node_id, `bm_pxe_ip_associate`, `bm_pxe_ip_disassociate` - from nova/tests/virt/baremetal/db/utils.py removed function `new_bm_pxe_ip` - removed nova/tests/virt/baremetal/db/test_bm_pxe_ip.py - modified `baremetal/volume_driver.py` - now we get `address` using nova db api Fixes bug 1156745 Change-Id: I61f78d692da276694d79a7c1a8d45a466d124c70
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove usage of locals() for formatting from nova.scheduler.*"Jenkins2013-06-205-14/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Remove usage of locals() for formatting from nova.scheduler.*Changbin Liu2013-06-195-14/+18
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using of locals() for formatting string is a nasty thing because: 1) It is not so clear as using explicit dicts 2) It could produce hidden errors during refactoring 3) Changing name of variable causes change in message 4) Creating a lot of unused variables fixes bug #1171936 Change-Id: I7639631846a9145c3a18f2a704b71184ec781f45
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Converts scheduler.utils.build_request_spec return to json primitive"Jenkins2013-06-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Converts scheduler.utils.build_request_spec return to json primitiveTiago Mello2013-06-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other than 'instance', 'image' can also be a complex structure and then it needs to be converted. See: nova.compute.rpcapi.prep_resize as an example. Change-Id: I54570dad3eae6ecc91a433af68263794c22e268d
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add oslo-config-1.2.0a2 and pbr>=0.5.16 to requirements."Jenkins2013-06-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add oslo-config-1.2.0a2 and pbr>=0.5.16 to requirements.Michael Wilson2013-06-191-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug #1189889. Change-Id: Id0dae9cea96ee779bc94a095d1ec5d046f2b39b4 Fixes: bug #1189889
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Retry the sfdisk command up to 3 times."Jenkins2013-06-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Retry the sfdisk command up to 3 times.Dan Prince2013-06-181-0/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the nova baremetal-deploy-helper so that we retry the fdisk command up to 3 times. Previously the command would sometimes intermittently fail with 'Device or resource busy' errors. There doesn't seem to be a good way to check/verify this other than to retry. Fixes LP Bug #1191084. Change-Id: I9c0733432dee5d556d6d2460db42f844e277c8de
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Libvirt driver: normalize variable names (part1)"Jenkins2013-06-191-49/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Libvirt driver: normalize variable names (part1)Rafi Khardalian2013-06-191-49/+50
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variable names referring to the same objects/data are different throughout the libvirt driver. This can lead to confusion, which leads to avoidable bugs. Part1: ctxt -> context instance_ref -> instance Change-Id: I9d170b6025935544f07ecdebe5a68b2e2eaba5dd
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fill context on objects in lists"Jenkins2013-06-192-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Fill context on objects in listsDan Smith2013-06-182-4/+9
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes object lists to not contain orphaned objects after making an RPC trip. Fixes bug 1191113 Change-Id: Ia90321da2f480835e1c7213a52eb5731840dbd6a
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "xenapi: script to rotate the guest logs"Jenkins2013-06-191-0/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | xenapi: script to rotate the guest logsJohn Garbutt2013-06-191-0/+62
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xen will produce the guest logs in a specified directory. This scripts configures the above logging as expected by the xapi plugin nova uses to read the logs. In addition it ensures that any log that grows bigger than 1MB will be truncated down to 5KB. Ensuring the log directory is inside a loop back device of a restricted size, and running this script every minute using cron, will stop guests from using up too much Dom0 disk space, and taking out the hypervisor Part of blueprint xenapi-server-log Change-Id: I4caa82f4d0620d924e37e3b605cf62b4d5b73570
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Added unit tests for vmware cluster driver"Jenkins2013-06-193-4/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Added unit tests for vmware cluster driverkirankv2013-06-183-4/+119
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie41b573f9a16a71306b6e2aca34f1d78f4b801c5
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add missing tests for nova.db.api.instance_system_metadata_*"Jenkins2013-06-191-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add missing tests for nova.db.api.instance_system_metadata_*Sergey Skripnick2013-06-181-0/+48
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blueprint db-api-tests Change-Id: I2a7b24d3b7b0fa7af004a8106dfef29178a9aaa3
* | | | | | | | | | | | | | | | | | | | | | | | Drop unused _virtual_power_settings global.Dan Prince2013-06-191-2/+0
| |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We aren't making use of this global so drop it. Change-Id: I66cdeb4a42af6785cb49c0768e6ba0f1bc98625c
* | | | | | | | | | | | | | | | | | | | | | | Merge "Check libvirt version earlier"Jenkins2013-06-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Check libvirt version earlierMatt Thompson2013-06-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running libvirt 0.8 causes an exception to be thrown before has_min_version() is run, resulting in no error message about version being logged. This change moves the version check before the libvirt calls are made. Change-Id: Ifaae18c6686d72fb79fc32081c4087084ae8bbb9 Fixes: bug #1190232
* | | | | | | | | | | | | | | | | | | | | | | Merge "Replace utils.to_bytes() with strutils.to_bytes()"Jenkins2013-06-194-77/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Replace utils.to_bytes() with strutils.to_bytes()Zhongyue Luo2013-06-144-77/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The to_bytes() function have moved to oslo. Replaced/removed the to_bytes() function with the one in strutils Change-Id: I14c33c6fb86db3088c11e02ce6e38ec022fad042