summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add external genconfig calls2015.1.0rc22015.1.0John Griffith2015-04-241-0/+6
| | | | | | | | | | | | | | After moving to oslo.config we still were using incubator config generator. This was ok, but the problem is we haven't been pulling config options from the oslo libs. This is a hack that just appends external lib calls and appends those options to the sample file being built. Change-Id: I2634b20ef4abd3bf7990f845d59ad3d208db234f (cherry picked from commit 51a22591a44932463847ed3247899db32ac49444) Closes-Bug: #1447380
* Merge "service child process normal SIGTERM exit" into stable/kiloJenkins2015-04-231-5/+2
|\
| * service child process normal SIGTERM exitBrant Knudson2015-04-221-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service.py had some code where the child process would catch the SIGTERM from the parent just so it could exit with 1 status rather than with an indication that it exited due to SIGTERM. When shutting down the parent doesn't care in what way the child ended, only that they're all gone, so this code is unnecessary. Also, for some reason this caused the child to never exit while there was an open connection from a client. Probably something with eventlet and signal handling. This is a cherry-pick of oslo-incubator commit 702bc569987854b602ef189655c201c348de84cb . Change-Id: I87f3ca4da64fb8070e4d6c3876a2f1ce1a3ca71d Closes-Bug: #1446583 (cherry picked from commit d73ac96d18c66aa4dd5b7d7f8d7c22e8f8434683)
* | Merge "Release Import of Translations from Transifex" into stable/kiloJenkins2015-04-234-746/+1624
|\ \ | |/ |/|
| * Release Import of Translations from TransifexAndreas Jaeger2015-04-204-746/+1624
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates also recreates all pot (translation source files) to reflect the state of the repository. This change needs to be done manually since the automatic import does not handle the proposed branches and we need to sync with latest translations. Note: This is part of importing of translations, there are no new translations for this project, thus only the pot file gets updated. Change-Id: Ib472c156a7007b2166c6857ae1fa2bb72a2e0c1a
* | Merge "Fix a wrong argument of create method" into stable/kiloJenkins2015-04-221-1/+1
|\ \
| * | Fix a wrong argument of create methodDaisuke Fujita2015-04-211-1/+1
| |/ | | | | | | | | | | | | | | Change the argument 'QoSSpecs.create' to 'qos_specs.create'. Closes-Bug: #1443331 (cherry picked from commit a3c0a4104f95acff00d3a9721caa4da730619fb7) Change-Id: Iabebc5f1681be75fb06d836ea72b93de0a9d688e
* | Merge "Windows SMBFS: fix volume extend" into stable/kiloJenkins2015-04-221-1/+1
|\ \
| * | Windows SMBFS: fix volume extendLucian Petrut2015-04-211-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Windows SMBFS driver inherits the Linux SMBFS driver, overriding Windows specific methods. This commit Ic89cffc93940b7b119cfcde3362f304c9f2875df added the volume name as an extra argument to the _do_extend_volume in order to check if differencing images are pointing to backing files other than the according volume disks. Although this is not required on Windows, this method should accept this extra argument in order to have the same signature as the method it overrides. At the moment, this raises the following exception: TypeError: _do_extend_volume() takes exactly 3 arguments (4 given) Closes-Bug: #1437290 (cherry picked from commit dca29e9ab3cdde210d3777e7c6b4a6849447058a) Change-Id: I868d7de4a2c68f3fc520ba476a5660a84f440bb1
* | Merge "Verify all quotas before updating the database" into stable/kiloJenkins2015-04-222-0/+23
|\ \
| * | Verify all quotas before updating the databaseankitagrawal2015-04-152-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update quota multi-value in one request is not an atomic operation, so even if a quota is invalid (e.g., volumes has a non-integer value), some values may change but the response code is 400. This patch will make sure the quota limits are of integer type for all the requested quota keys before updating the database. Closes-Bug: 1432972 Change-Id: If83af0a80489887098e52b03b9c4012e3ef061b5 (cherry picked from commit 197299985a52535ad995dbd111491b58462f140a)
* | | Merge "Include boot properties from glance v2 images" into stable/kiloJenkins2015-04-222-0/+68
|\ \ \
| * | | Include boot properties from glance v2 imagesJon Bernard2015-04-152-0/+68
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for users to take advantage of COW volumes created from a glance image, Cinder must be configured to use Glance API version 2 (default is 1). In version 2, the required boot metadata (kernel_id and ramdisk_id) are no long stored in the 'properties' dict, but as standalone fields in the GET response from glance. The existing cinder parser for the glance request is not aware of this and the volume created form a v2 image will lack this required metadata. This was causing the recent Ceph CI gate failures for test_volume_boot_pattern. Change-Id: I688898b3841691369d73887f7eabdceb05155db1 Closes-Bug: #1439371 (cherry picked from commit ea109b5f24dca93fd6f660bc436a685d6101bcea)
* | | Merge "Add locking to PureISCSIDriver around creating Purity Host objects." ↵Jenkins2015-04-221-0/+1
|\ \ \ | |_|/ |/| | | | | into stable/kilo
| * | Add locking to PureISCSIDriver around creating Purity Host objects.Patrick East2015-04-151-0/+1
| |/ | | | | | | | | | | | | | | | | This will prevent us from getting conflicting credentials for connection methods which will result in iSCSI attach operations to fail. Change-Id: Ia206e7b5ff330c8fccb49ed23a31b120a5c04eb3 Closes-Bug: 1444224 (cherry picked from commit a712afe42833443878898bb42851376cd8615ff9)
* | update .gitreview for stable/kiloThierry Carrez2015-04-171-0/+1
| | | | | | | | Change-Id: I64a4fc6af6f83b2d8a6bb5fe9aa0dc3acd58e4ce
* | Updated from global requirementsOpenStack Proposal Bot2015-04-161-5/+5
|/ | | | Change-Id: I49730dab41606a457645ca33d6af79639001a0f4
* Merge "Create initiator id if not exist in VMAX driver"2015.1.0rc1proposed/kiloJenkins2015-04-095-13/+101
|\
| * Create initiator id if not exist in VMAX driverXing Yang2015-04-065-13/+101
| | | | | | | | | | | | | | | | | | | | This problem was discovered in a customer's environment. If the initiator id (hardware id SMI-S instance) does not exist on the array, the attach volume operation will fail. In this patch, the initiator id will be created if it doesn't exist. Change-Id: I868118528d831a9f49081a6393e64eb7a414b36f Closes-Bug: #1440427
* | Merge "Fix the unicode encode error when create volume"Jenkins2015-04-092-2/+12
|\ \
| * | Fix the unicode encode error when create volumewanghao2015-03-092-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | Using six.text_type(value) to set image_name to avoid UnicodeEncodeError. Change-Id: I30542df18f31a3e07cb4b9a61521ebded62ffbc4 Closes-Bug: #1426203
* | | Merge "GlusterFS: Returning provider location of volume from snapshot"Jenkins2015-04-091-1/+1
|\ \ \
| * | | GlusterFS: Returning provider location of volume from snapshotBharat Kumar Kobagana2015-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch returns the provider location of volume, which is created from snapshot. Partial-Bug: 1441050 Reported-By: Deepak C Shetty <deepakcs@redhat.com> Change-Id: I5994f2f6c125888d442055d9e65355f0af1b22f4
* | | | Merge "Fix multipath device discovery when UFN is enabled."Jenkins2015-04-082-20/+55
|\ \ \ \
| * | | | Fix multipath device discovery when UFN is enabled.Lee Yarwood2015-04-022-20/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This currently returns an invalid path of `/dev/mapper/${WWID}` when UFN is enabled leading to failures later on when we attempt to use the device. The output of `multipath -l ${path}` or `multipath -l ${wwid}` should always list the correct device identifier to use with this path as the first word on the first line. Closes-Bug: 1401799 Change-Id: Ib371b699fadcbbbb666e08eb0124c442e94a55e8
* | | | | Merge "Revert "Removing Windows drivers""Jenkins2015-04-084-0/+895
|\ \ \ \ \
| * | | | | Revert "Removing Windows drivers"Mike Perez2015-04-074-0/+895
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 85f0814e1a96ea043e8048cf7081f70fa024f20b. Change-Id: I0b078a60e8d9c95d12185d1ff3ffe74fb71f10ab
* | | | | Merge "Delete the temporary volume if migration fails"Jenkins2015-04-083-40/+199
|\ \ \ \ \
| * | | | | Delete the temporary volume if migration failsVincent Hou2015-04-083-40/+199
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues resolved in this patch include the following changes: * A temporary volume is created on the destination host before migrating the data from the source. However, if the creation of this volume fails, its record will be left in the database as redundant information. This patch will remove the database record if the creation fails. * If attaching the remote dest volme fails at initialize_connection due to timeout, we need to terminate the connection. Otherwise, the dest volume will not be released and successfully deleted. Closes-bug: #1398177 Change-Id: I5bc75bd7652841fddd66481ee001fb682168215c
* | | | | Merge "Rbd update volume stats in wrong way"Jenkins2015-04-082-13/+30
|\ \ \ \ \
| * | | | | Rbd update volume stats in wrong waywuyuting2015-04-072-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cinder volume uses a RADOS pool to store volumes and update storage stats periodically. However, rbd driver reports the whole cluster stats but not the pool's. This is wrong. The right way is to report the pool stats but not the whole cluster. Change-Id: Ie18324ebd8b85f7b63dc034ba20857ae9e470804 Closes-Bug: #1434441
* | | | | | Merge "Correct cinder hacking check numbering"Jenkins2015-04-082-26/+26
|\ \ \ \ \ \
| * | | | | | Correct cinder hacking check numberingJay S. Bryant2015-04-072-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a couple of hacking checks that are specific to Cinder that were written a while back. Unfortunately, when they were written the numbering scheme for hacking checks was not understood. We used N3xx when we should have used C3xx. This patch corrects that mistake. Change-Id: Ia17797005d444ab53a45b47b80b97799114001ee Closes-bug: 1440833
* | | | | | | Merge "Add hacking check for print() statements"Jenkins2015-04-085-10/+42
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Add hacking check for print() statementsJay S. Bryant2015-04-075-10/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are frequently having to -1 patches because people forget print() statements that were used for debug in their development. Can save everyone time and trouble by adding this simple hacking check. The check excluded the cinder/cmd directory as the files in there legitimately need to use the print() command. Also wsgi.py and the test_hds_nas_backend.py files make use of print, so I have excluded those from checking as well. Change-Id: I2066eeb2bdc6c9af294d0b9befb7e0b32abd1378
* | | | | | Merge "Partial Revert "Removing ZFSSA driver""Jenkins2015-04-076-0/+2004
|\ \ \ \ \ \
| * | | | | | Partial Revert "Removing ZFSSA driver"Mike Perez2015-04-066-0/+2004
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c742566a6920f7260573fbd0dc71a5cc1e4a2311. However, the ZFSSA iSCSI driver is still left out because there is no CI for it. Change-Id: Ibf830f295043624ca9a5dc90f1e3a897cb64915f
* | | | | | | Merge "Add missing copy_volume_to_image method to Sheepdog driver"Jenkins2015-04-072-0/+63
|\ \ \ \ \ \ \
| * | | | | | | Add missing copy_volume_to_image method to Sheepdog driverYAMADA Hideki2015-04-072-0/+63
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy Volume to Image feature is required since Havana release. The Sheepdog driver has not implemented it. Change-Id: I940095be7ed3721cc8f1bafde821fbb420d305d0 Closes-Bug: #1426431
* | | | | | | Merge "Partial Revert "Removing Huawei drivers""Jenkins2015-04-076-0/+3279
|\ \ \ \ \ \ \
| * | | | | | | Partial Revert "Removing Huawei drivers"Mike Perez2015-04-076-0/+3279
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5e26b0c1d1ae1984e51ae47441e8a243f224bf29. Change-Id: Iad7c1afff1a932876255a37fc0b5bf5993246aaa
* | | | | | | Merge "Set volume_attachment to [] for the temporary volume creation"Jenkins2015-04-072-60/+113
|\ \ \ \ \ \ \
| * | | | | | | Set volume_attachment to [] for the temporary volume creationVincent Hou2015-04-022-60/+113
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new table volume_attachment has been added recently. During the creation of the temporary volume in migration, the attribute volume_attachment is not empty if an attached volume is going to be migrated, because all the properties are simply copied. This non-empty attribute volume_attachment leads to the failure of the volume creation. This patch removes this attribute before the temporary volume creation. Besides, detach the volume should consider multi-attach as well by adding the attachment id parameter. Change-Id: I7c2f69945ee8d72b2dba4e68a91b872207df5310 Closes-bug: #1433019
* | | | | | | Merge "More error handling on EMC VNX migration failure"Jenkins2015-04-072-20/+146
|\ \ \ \ \ \ \
| * | | | | | | More error handling on EMC VNX migration failureJeegn Chen2015-04-022-20/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a LUN migration session is stopped or faulted after started, current implementation of VNX Cinder Driver only wait for timeout and no logic will clean up the broken migration session. This patch adds logic to detect and clean up the stopped/faulted migration session. Change-Id: If66109ca45fce303390c4144b4120e75f1aae138 Closes-Bug: #1420075
* | | | | | | | Merge "Fixed encrypted property for 3PAR FC and iSCSI drivers"Jenkins2015-04-073-3/+156
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fixed encrypted property for 3PAR FC and iSCSI driversAnthony Lee2015-04-063-3/+156
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3PAR FC and iSCSI drivers were not returning the 'encrypted' property when initialize_connection was called. This patch adds that property to the returned info. Closes-Bug: #1439917 Change-Id: Icfbebd055ea1bae1fc4749b441eb4f90fa1bfacd
* | | | | | | Merge "Revert "Removing Netapp FC drivers for no reported CI""Jenkins2015-04-064-0/+185
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Removing Netapp FC drivers for no reported CI"Alex Meade2015-04-014-0/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3ee75e73938a8ca069674269bc21f13720e4b6d5. Change-Id: Idd7e3bd0df393f61ba9c5011166b7d5ba196753b
* | | | | | | Merge "Check volume status in detach db api"Jenkins2015-04-062-1/+28
|\ \ \ \ \ \ \