summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated from global requirementsicehouse-eol2014.1.5stable/icehouseOpenStack Proposal Bot2015-04-201-1/+1
| | | | Change-Id: Icd67f1732ae26089454520b4230102a257632780
* Updated from global requirementsOpenStack Proposal Bot2015-04-082-18/+18
| | | | Change-Id: I1cecd8648cc8a0faf53a7258d1b5ff3dea761679
* Bump stable/icehouse next version to 2014.1.5Alan Pevec2015-03-131-1/+1
| | | | Change-Id: I4fa7090317eb140b3f1e5e1fbc96096b90bcbc95
* Updated from global requirements2014.1.4OpenStack Proposal Bot2015-02-251-5/+5
| | | | Change-Id: Idcd6272d40702a1093e2b7283611c1fbd6d46bd3
* Updated from global requirementsOpenStack Proposal Bot2015-01-272-10/+10
| | | | Change-Id: I4baaa1acf5646f77eb88bea0c9d32f8d95cf70a5
* Fix trove-tox-doc-publish-checkbuild failuresBrian Hunter2015-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The owners of maven.research.rackspacecloud.com/ seem to have introduced a 301 redirect permanent from http -> https URLs on around Jan 10th. This has broken the master/trove check builds since that time. Maven, when running in the infrastructure CI environment, fails to follow these redirects. This code change simply refers to the maven software repositories using https URLs. Local testing of this change against Tesora's downstream CI found that it may be necessary to purge the broken/cached file from the bare-trusty CI build machines ala: rm /home/jenkins/.m2/repository/com/rackspace/cloud/api/wadl-tools/1.0.9 (continued..) /wadl-tools-1.0.9.jar Closes-Bug: #1412949 Conflicts: apidocs/pom.xml Change-Id: I2dece05c74ad18a96fa05791e368ff7283a5e4e5 (cherry picked from commit 386ddc22680e8e9be3a34241067b0e34a192ebea)
* Bump stable/icehouse next version to 2014.1.4Adam Gandelman2014-10-021-1/+1
| | | | Change-Id: I1b2e9b58d2eccbe4e7a00b1549adcdcea5845afb
* Sync latest process and str utils from oslo2014.1.3Tristan Cacqueray2014-09-146-70/+121
| | | | | | | | | | | | | | | | | | | | | | | | | This sync required changes to fix these issues: * Make execute method clean password in exception * Make sure mask_password works properly This is not trivial as these fixes relies on many other changes, only the necessary code have been imported/adapted. ------------------------------------------------ The sync pulls in the following changes (newest to oldest): 63c99a0f - Mask passwords in exceptions and error messages 66142c34 - Make strutils.mask_password more secure d6b55fb2 - Remove `processutils` dependency on `log` cb5a804b - Move `mask_password` to strutils ----------------------------------------------- Closes-Bug: 1343604 Closes-Bug: 1345233 SecurityImpact Change-Id: I3b49b1d667f6ade9ae3f6765d735440a3e838917
* Set the python hash seed that tox uses to 0Nikhil Manchanda2014-08-251-2/+4
| | | | | | | | | | | | | | | The current trove unit tests don't work correctly with the random hash seed that the new tox sets by default. This change forces the new tox to use 0 as the hash seed which should unblock the gate until we can fix the trove unit tests to run correctly with a random hash seed. This change will probably need to be backported to the stable branches to ensure that the tox tests keep working there as well. Change-Id: Ib5c6d4d166c847ce94ec70740c5753d338687865 (cherry picked from commit 7e6cf5bfaf57ef8628c8f72ea29ecd12179fab72)
* Bump stable/icehouse next version to 2014.1.3Chuck Short2014-08-081-1/+1
| | | | | | | Bump stable/icehouse next version to 2014.1.3 Change-Id: Ieed6898a157ff1e98136705d32883761ab505dd4 Signed-off-by: Chuck Short <chuck.short@canonical.com>
* Merge "Make default extension path relative to pybasedir" into stable/icehouse2014.1.2Jenkins2014-08-011-1/+1
|\
| * Make default extension path relative to pybasedirGreg Lucas2014-07-171-1/+1
| | | | | | | | | | | | | | | | Load extensions from the trove base dir regardless of the current working directory. Closes-Bug: 1316195 Change-Id: I7f75998a357d1fb2033ed944c552fd856c2f2939
* | Merge "Bump stable/icehouse next version to 2014.1.2" into stable/icehouseJenkins2014-08-011-1/+1
|\ \
| * | Bump stable/icehouse next version to 2014.1.2Alan Pevec2014-06-241-1/+1
| |/ | | | | | | Change-Id: Id7181755d3609c0ae91c2402b34f2de02c06a1f0
* | Merge "Make default extension path relative to pybasedir" into stable/icehouseJenkins2014-08-011-2/+3
|\ \
| * | Make default extension path relative to pybasedirIonuț Arțăriși2014-07-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change the default extension path in the sample config files as these take precedence over the files values in common/cfg.py Change-Id: I3c473fb9cd7e81341a1963a35834ef4c2fd69717 Closes-Bug: 1316195
* | | Merge "Updated from global requirements" into stable/icehouseJenkins2014-07-311-1/+1
|\ \ \
| * | | Updated from global requirementsOpenStack Proposal Bot2014-07-241-1/+1
| | | | | | | | | | | | | | | | Change-Id: I44f69ef8d41224eadcf4afc157ea330932ffd8bb
* | | | Merge "Don't specify admin_token in paste config" into stable/icehouseJenkins2014-07-313-3/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Don't specify admin_token in paste configJamie Lennox2014-06-183-3/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not a value that is going to be useful on other systems and shouldn't be included in the default or test pipelines. The two similar commits were squashed together here. (cherry picked from commit ae696056fbac7d74a395710934950e0013cd4d37) (cherry picked from commit 9db80e79ea3e687000121729648af7e79b7b2d78) Closes-Bug: #1299332 Change-Id: I714539b7536965fa08a3ddc64493b481df7397e3
* | | Merge "Updated from global requirements" into stable/icehouseJenkins2014-07-242-2/+2
|\ \ \ | |_|/ |/| |
| * | Updated from global requirementsOpenStack Proposal Bot2014-07-222-2/+2
| | | | | | | | | | | | Change-Id: I2012fa9db3d52c724c7c08e791caeb2d736abb17
* | | Merge "Ensure routing key is specified in the address for a direct producer" ↵Jenkins2014-07-221-1/+2
|\ \ \ | |/ / |/| | | | | into stable/icehouse
| * | Ensure routing key is specified in the address for a direct producerRussell Bryant2014-06-091-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is already merged in oslo-incubator. Note that this is not a clean merge of the fix, as Trove's copy of rpc from oslo-incubator is *VERY* far out of date. However, the bug still existed in the code. The fix just looks slightly different. Original commit message body includes: Porting this fix from oslo.messaging. This fixes the impl_qpid.py driver to allow it to work with the latest stable upstream QPID broker (version 0.28). See the Apache Qpid Jira bug https://issues.apache.org/jira/browse/QPID-5557 Change-Id: If71f78e50f8a9b3acfd1e9d02c8271f17c4ebee7 Related-Bug: #1300318 (cherry picked from commit 117c18cbd9d5ab3970ad3775e156862f256a924a)
* | Moved the apidocs from openstack/database-apiTim Simpson2014-07-18199-1/+15186
|/ | | | | | | | | | By hosting the docs here we'll be able to better maintain that developers are being mindful of changes or even occassionally writing documentation for new API features. This should also allow us to autogenerate the snippets. Change-Id: I0111bcd38341b1736a47b0a3d3e6ff96d2ca1c58 (cherry picked from commit 294330c554eff8e2b120d2e4a2d39a44412de200)
* Opening stable/icehouseThierry Carrez2014-04-172-1/+2
| | | | | | | Bump version to next stable release on icehouse branch, and set defaultbranch in .gitreview for convenience. Change-Id: Ie41a7fc5067eb733e7118f40ae05524697e4e42c
* Merge "Fix create call for security group rules"2014.1.rc12014.1Jenkins2014-04-026-87/+104
|\
| * Fix create call for security group rulesDenis Makogon2014-04-016-87/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to fix the create security group call to correctly use the per-datastore configs to set the port, and protocol values for the security group rule. The only parameter that the trove user should be able to specify for the rule is the CIDR. Changes: - Use the datastore specific ports and protocol for creating the new security group rule. Changes: - using datastore-specific ports for building new rules, based upon income CIDR; Change-Id: Ic1440f735b6cf2b8b4f29c5ab9f48bcb427ca9e6 Closes-Bug: #1298749
* | Merge "Updated from global requirements"OpenStack Jenkins2014-04-022-14/+14
|\ \
| * | Updated from global requirementsOpenStack Jenkins2014-04-012-14/+14
| |/ | | | | | | Change-Id: Ie9d3fc8dd87474814c4684998f8003e7a216e9d9
* | Fixed unit test to not actually run backup commandNikhil Manchanda2014-04-011-1/+3
|/ | | | | | | | | | | | | One unit tests is still trying to execute the actual backup command instead of the mocked backup command. This is causing an issue on the Jenkins slave where it is trying to run as sudo (and failing). Fixed the test to use a mock runner, and not try to run innobackupex. This had been previously fixed by commit 19d940516e, but that fix was clobbered by the move from mockito to mock. Change-Id: Ib63187d4414a3ef7b7f664e076bb4d92a40c2214 Closes-bug: 1291516
* Remove mockito, and replace with mockNikhil Manchanda2014-03-3121-1332/+1401
| | | | | | | | | | There are unit tests in trove which are dependent on mockito. This fixes them to use the standard mock library which is a part of global_requirements. Co-Authored-By: Justin Hopper <justin.hopper@hp.com> Implements-bp: remove-mockito Change-Id: Ic030cc846d9e7d0c9077240b0fac90f4f66a5a42
* Tox tests should not require errors in rigid orderNikhil Manchanda2014-03-265-84/+99
| | | | | | | | | Fix the tox tests to not require Validation Error messages to be returned in a specific order. Since the order of validation errors can be non-deterministic, the tests should merely check for existence of the error. Change-Id: I615359cfb7129b2af9f22c43ad4475b53f7acab3 Closes-bug: 1294850
* Merge "Fixed unit test to not actually run backup command"Jenkins2014-03-261-2/+2
|\
| * Fixed unit test to not actually run backup commandNikhil Manchanda2014-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | One unit tests is still trying to execute the actual backup command instead of the mocked backup command. This is causing an issue on the Jenkins slave where it is trying to run as sudo (and failing). Fixed the test to use a mock runner, and not try to run innobackupex. Change-Id: Ifff7945be158a08167cdd282ed8eb18952224eee Closes-bug: 1291516
* | Imported Translations from TransifexOpenStack Jenkins2014-03-2463-31/+214994
| | | | | | | | Change-Id: Ib11144ccb6d567f820db7adae0a9ae7bde32f511
* | Merge "Setup trove for translation"Jenkins2014-03-203-0/+3482
|\ \
| * | Setup trove for translationAndreas Jaeger2014-03-193-0/+3482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upstream-translation-job exists already but fails since trove is not setup properly for translation. Add the usual babel.cfg file, update setup.cfg for translation and create initial trove.pot file. Change-Id: I65ca2c974fc54e005ba8887dceb66ac08432c6d1
* | | Merge "Update sqlalchemy migrate scripts for postgres"Jenkins2014-03-201-3/+13
|\ \ \
| * | | Update sqlalchemy migrate scripts for postgresNikhil Manchanda2014-03-171-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pgsql <= 8.3 was lax about char->other casting but this was tightened up in 8.4+. We must now specify the USING clause for such a cast to succeed. The SQL queries generated by sqlalchemy for pgsql don't support this, so an override is needed to support pgsql for the trove migrate scripts. Closes-bug: 1293465 Change-Id: I217fc861036911e61bafe706e338bb3b8f49e708
* | | | Merge "Remove IDENTIFIED BY clause for MySQL REVOKE"Jenkins2014-03-191-2/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove IDENTIFIED BY clause for MySQL REVOKEMat Lowery2014-03-171-2/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | IDENTIFIED BY is not documented for REVOKE in MySQL 5.5 and 5.6 and furthermore produces a syntax error on MySQL 5.6. Change-Id: Ib7bf1ba0ce049c1ed8a90292064a1e05724170e0 Closes-Bug: #1292690
* | | Merge "Fixes insecure update of /etc/fstab file"Jenkins2014-03-192-10/+12
|\ \ \
| * | | Fixes insecure update of /etc/fstab fileSushil Kumar2014-03-112-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reasons: - While updating /etc/fstab in write_to_fstab in trove/guestagent/volume.py, the temporary file-name was easy to guess and had a permanent name making it prone to unwanted access. - The temporary file-permission was set to 666, making it insecure. Changes: - Uses NamedTemporaryFile for temporary file creation. - Used file reading instead of copying the file. - These changes eliminate the chances of guessing the file-name, as well as updating the same. Change-Id: I07c3980e40fe218d35605a851a17535cd3972c11 Closes-Bug: #1267991
* | | | Merge "Added Backup/Restore validations"Jenkins2014-03-194-2/+50
|\ \ \ \ | |_|/ / |/| | |
| * | | Added Backup/Restore validationsRamashri Umale2014-03-174-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added checks for backup-create API call to ensure datastore supports backup strategy Also for trove-create API call (when restoring from backup) added checks to ensure that datastore version of backup being restored matches with datastore version of instance being created Change-Id: I9f9cf76ce3d2533612515e6382a184e955e09a32 Closes-Bug: #1285876
* | | | Merge "Hide Datastores In List With No Active Versions"Jenkins2014-03-177-5/+40
|\ \ \ \
| * | | | Hide Datastores In List With No Active Versionsamcrn2014-03-147-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in a datastore-list operation, for non-admin, filters out datastores that either have no versions or have no active versions for non-admin users. admins continue to see all datastores, active or inactive, in a datastore-list operation. Change-Id: Iccaf9ae59469fd0f4cb346ee258d3132eed83660 Co-Authored-By: Andrey Shestakov <ashestakov@mirantis.com> Closes-Bug: #1290617
* | | | | Merge "Fix Timestamp diff in Instance and Notification"Jenkins2014-03-161-2/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix Timestamp diff in Instance and Notificationjustin-hopper2014-03-141-2/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code is updating timestamp to clear out task status after it has already completed the task and updated the instance db info. Made this an single transaction so that the timestamp in the db matches the actual action and the notification Closes-Bug: 1236620 Change-Id: Iaa59f6e6d0b958e79b0491bfa2a838f5896d9705