summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Support handling empty string for volume AZ" into stable/train13.0.1Zuul2020-03-053-1/+31
|\
| * Support handling empty string for volume AZFeilong Wang2020-02-263-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a complex stack, instance and volume are both necessary. But the support of AZ in Nova and Cinder are slightly different which is causing troubles to build the Heat template. Without setting, the property availability_zone of volume always got "", an empty string, instead of None. As a result, Cinder will return 400 BadRequest error. This patch will turn the empty string into None, to make sure Cinder can correctly handle the scenario when availability_zone of volume is not set. Task: 38853 Story: 2007330 Change-Id: Ib5bddf12ca63849a030d1d579d0a2e853e8b848a (cherry picked from commit 50d72b8c0b6ef9d025c8de3fe036c414f73dbd06)
* | Handle OS::Mistral::Workflow resource replacement properlyRabi Mishra2020-02-263-21/+87
|/ | | | | | | | | | | | | | | | | | | | OS::Mistral::Workflow resource creates a mistral workflow with a unique name (resource_id). We replace FAILED resources by default and replace wont work in this case as it will try to use the same workflow name for the replacement resouce, if the 'name' property is provided. If the workflow does not exist/deleted using mistral api directly, it would create a replacement resource, but it would delete the workflow when cleaning up the old resource. So we would endup with a replacement resource without any backing workflow. This adds a new resource attribute ``always_replace_on_check_failed`` and overrides needs_replace_failed() for OS::Mistral::Workflow. Task: 38855 Change-Id: Ia0812b88cae363dfa25ccd907ecbe8b86f5b1a23 (cherry picked from commit 9e80518b900a1f14a80ee05ddeef4b250433febd)
* Merge "Docs: Fix links broken since Train release" into stable/trainZuul2020-02-242-6/+5
|\
| * Docs: Fix links broken since Train releaseZane Bitter2020-02-242-6/+5
| | | | | | | | | | Change-Id: Iccd1185c697d3c44c887ee69ef403c8c4c9ef6fb (cherry picked from commit 40ec7665687342b6c959d0d8b77aaace12b51d30)
* | Merge "Docs: Fix link broken since Stein release" into stable/trainZuul2020-02-241-1/+1
|\ \ | |/
| * Docs: Fix link broken since Stein releaseZane Bitter2020-02-241-1/+1
| | | | | | | | | | Change-Id: I3c9bdfe1bc40e6b96335041928aed275d1eb4958 (cherry picked from commit 18f59964a02fa3dd00f8f250bfd00857ae9f4310)
* | Merge "Docs: use extrefs to link to other projects' docs" into stable/trainZuul2020-02-2412-70/+74
|\ \ | |/
| * Docs: use extrefs to link to other projects' docsZane Bitter2020-02-2412-70/+74
| | | | | | | | | | | | | | | | | | | | | | This feature of openstackdocstheme means that we'll always link to the corresponding branch of another project (i.e. latest links to latest, but train links to train, &c.) https://docs.openstack.org/openstackdocstheme/latest/#external-link-helper Change-Id: If94115f87af3689413405f3283be7fb197fab058 (cherry picked from commit dd70d9244d5a8b8b91b3e5908b45bf5b7f6a8974)
* | Update Fedora image ref for test jobsricolin2020-02-243-4/+4
|/ | | | | | | Fedora-Cloud-Base-29-1.2.x86_64 is removed from openstack local mirror. Update to use Fedora-Cloud-Base-30-1.2.x86_64 for test jobs. Change-Id: I942d7f1fc4b54304f472e0cb0097f7dcb70f3c71
* Fix Designate Zone ID lookup for realRabi Mishra2020-01-243-9/+1
| | | | | | | | | | | | When there are no 'supported_versions' defined for a client plugin, we should not use version when calling self.client() Also fixes similar issue in resources. Task: 38165 Change-Id: Ifce776e8e8375f6a4399574aa71cc2f81ecc57b0 (cherry picked from commit 2f63735a5c42443fbe9fa5f031259dd08db0bd7a)
* Merge "Correct BRANCH_OVERRIDE for stable/train" into stable/trainZuul2020-01-151-0/+1
|\
| * Correct BRANCH_OVERRIDE for stable/trainricolin2020-01-101-0/+1
| | | | | | | | | | | | Change-Id: I653fd7bc3c00771c9610104ef1498d3ecac16adc Story: #2007061 Task: #37921
* | Merge "Eliminate race in CancelUpdateTest" into stable/trainZuul2020-01-141-0/+4
|\ \
| * | Eliminate race in CancelUpdateTestZane Bitter2020-01-021-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of this test is to ensure we can rollback an in-progress Server resource with attached ports. However, by cancelling immediately we create a race whereby the stack may be rolled back before we have even started updating the stack, in which case we are not testing the behaviour we actually care about. Inserting a delay gives Heat enough time to process the Port and start updating the Server before we cancel the update. In some circumstances this could also trigger a race within Heat, whereby the rollback traversal would not block, but the update traversal would retrigger it anyway. This resulted in the stack rollback being marked COMPLETE multiple times, which could also lead to errors in deleting the old raw_template after it had already been removed. The latter have been fixed by separate patches. The race itself should be addressed separately. Change-Id: I3f9db686c31659437ff4797555e6608986946572 Task: 37199 (cherry picked from commit 3b4e0cda282e3df64daf16d64081faa47dd72135)
* | Fix the wrong time unit for OS::Octavia::HealthMonitorLingxian Kong2019-12-271-2/+2
|/ | | | | | | | | | | Unit of both 'delay' and 'timeout' should be seconds based on Octavia API doc https://docs.openstack.org/api-ref/load-balancer/v2/index.html?expanded=create-health-monitor-detail#id105 Change-Id: I6de88e687ff95432ddbd0547a7f5759e18d7749e Story: 2006637 Task: 36852 (cherry picked from commit ad841b4483eeba9dfd0ccd8f8b4c5d5fd3e15cc1)
* Merge "Don't use wrap_db_retry on subtransaction in ↵Zuul2019-12-202-8/+16
|\ | | | | | | resource_create_replacement()" into stable/train
| * Don't use wrap_db_retry on subtransaction in resource_create_replacement()Zane Bitter2019-10-182-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wrap_db_retry decorator must be used outside the outermost DB transaction. Using it on a subtransaction means that the main transaction gets marked for rollback but not closed, leaving the session in the 'inactive' state. This change ensures that the decorator is not used when we update the previous resource from within a subtransaction as part of creating a replacement resource, and instead the retry happens outside the main transaction. Change-Id: I28bfcc43b108d4d907098b2f0cf3553aab399553 Task: 36957 (cherry picked from commit 2398191be91d0dd145a4183f9a025fff1aa3727e)
* | Merge "Update TOX/UPPER_CONSTRAINTS_FILE for stable/train" into stable/trainZuul2019-12-171-1/+1
|\ \
| * | Update TOX/UPPER_CONSTRAINTS_FILE for stable/trainOpenStack Release Bot2019-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the URL to the upper-constraints file to point to the redirect rule on releases.openstack.org so that anyone working on this branch will switch to the correct upper-constraints list automatically when the requirements repository branches. Until the requirements repository has as stable/train branch, tests will continue to use the upper-constraints list on master. Change-Id: Iea3dba53b2363e164068091795d1824fcc156b92
* | | Imported Translations from ZanataOpenStack Proposal Bot2019-11-1910-149/+345
| | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I2c2b36879225d14a1cfdba1242fa1c5a864e150d
* | | Fix Designate Zone ID lookupZane Bitter2019-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This was broken by a8fba21f238de0b5a62c97ef8571539aa0f536b5. Change-Id: I4562a6c243c9010337252d5c57485dc5f64268e1 Task: 37373 (cherry picked from commit 03819bd4499233e71641210e87e1270214574c6d)
* | | Fix cfn-init-data path in ignitionFeilong Wang2019-10-172-11/+18
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'local-data' in path /var/lib/os-collect-config/local-data should be a directory, not a file. However, even if we can fix this, now os-apply-config will merge configs based on the order [ec2, heat and local], but actually there is no deployments collected local. Then unfortunately, the deployments collected from Heat will be overwriten because the merging order in os-apply-config. At this moment, we can't change os-apply-config since it's deliberate. So the only reasonable way we can do now is using /var/lib/heat-cfntools/cfn-init-data and /var/lib/cloud/data/cfn-init-data. Story: 2006566 Task: 36851 Change-Id: I3b1ed30967e9235e9e830c5e4156f739303be618 (cherry picked from commit ea18c18188f94fe3e58f9ea423255060a3be45eb)
* | Merge "Update .gitreview for stable/train" into stable/trainZuul2019-10-101-0/+1
|\ \ | |/
| * Update .gitreview for stable/trainOpenStack Release Bot2019-09-291-0/+1
| | | | | | | | Change-Id: I4bf2e4c9c8a78b33700a6a55b13d951ea06db860
* | Merge "Imported Translations from Zanata" into stable/train13.0.0.0rc213.0.0Zuul2019-10-0214-3273/+36
|\ \
| * | Imported Translations from ZanataOpenStack Proposal Bot2019-10-0214-3273/+36
| |/ | | | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I9e1ecdea2ddd6dfcfef4fbe0fdcc89f9ed881fe9
* | Support Ignition for userdataFeilong Wang2019-10-014-5/+85
|/ | | | | | | | | | | | | | Fedora CoreOS will replace Fedora Atomic being the next generation container OS. So it would be nice to support Fedora CoreOS in Heat. In Fedora CoreOS, the cloud-init will be replaced with Ignition[1], so the changes proposed in this patch are mainly focusing on how to support Ignition when using Heat SOFTWARE_CONFIG with Ignition. Task: 36671 Story: 2006566 Change-Id: I11df2431634de7d8b584b1a2ac733d43959e34fc (cherry picked from commit f6249c0110cf2ce8d1b2b7116f872c2df29e5666)
* Merge "Remove designate v1 support"13.0.0.0rc1Zuul2019-09-286-331/+18
|\
| * Remove designate v1 supportRabi Mishra2019-09-266-331/+18
| | | | | | | | | | | | | | Remove support completely and map the v1 resources to NoneResource. Change-Id: I8252e7feb4c1b87497770bf045d844fe5975c2b9
* | Merge "Update devel info: mailing list"Zuul2019-09-272-3/+3
|\ \
| * | Update devel info: mailing listZhongShengping2018-12-052-3/+3
| | | | | | | | | | | | | | | | | | | | | The new openstack-discuss mailing list is going to replace few mailing lists, including openstack-dev. Change-Id: I5d5f87614f692444728eb204f8d794e80179a4c8
* | | Merge "Use ThreadGroup.add_timer() API correctly"Zuul2019-09-272-2/+2
|\ \ \
| * | | Use ThreadGroup.add_timer() API correctlyZane Bitter2018-12-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In practice we never pass any arguments to the callback function, but if we did we'd be doing it wrong. Multiple projects appear to have copied this code from us (directly or indirectly). Fix it before we lead anyone else astray. Change-Id: If9cddc470158f32587b2aac19e92d1e01b48bc50
* | | | Merge "Do not re-clone heat in devstack plugin"Zuul2019-09-271-5/+0
|\ \ \ \
| * | | | Do not re-clone heat in devstack pluginPavlo Shchelokovskyy2019-05-311-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devstack already clones the source from the repo/ref provided to enable_plugin function. Having to re-clone heat effectively requires to also set HEAT_BRANCH separately which is unnecessary repetition and make it less obvious how to deploy Devstack+Heat from stable branches locally w/o Zuul Cloner with RECLONE=true. Change-Id: I91b5048efa4606e86094e0a458e320216f66ce3e
* | | | | Merge "change import order"Zuul2019-09-261-6/+7
|\ \ \ \ \
| * | | | | change import orderchenjiao2018-01-181-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alphabetically order your imports by the full module path. Organize your imports according to the Import order template and Real-world Import Order Examples below. {{stdlib imports in human alphabetical order}} \n {{third-party lib imports in human alphabetical order}} \n {{project imports in human alphabetical order}} \n {{begin your code}} Change-Id: Ie3a9f1dd36272f5512f719f4db8a219015c99fec
* | | | | | Merge "Switch to review.opendev.org"Zuul2019-09-261-1/+1
|\ \ \ \ \ \
| * | | | | | Switch to review.opendev.orgricolin2019-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our gerrit system is now migrated to review.opendev.org Change-Id: Idb9a6441289343bd487c367601f566b654c79722
* | | | | | | Merge "Update readme"Zuul2019-09-251-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Update readmelidong2019-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add octavia client info to readme.rst Change-Id: I9069955c26d9815ac91bb26a70da5040a4045038
* | | | | | | | Merge "Blacklist eventlet 0.21.0,0.23.0,0.25.0"Zuul2019-09-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Blacklist eventlet 0.21.0,0.23.0,0.25.0pengyuesheng2019-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more details https://review.opendev.org/#/c/678078/ Change-Id: If308e6df439e9e104c67b0bd71cda861ed477332
* | | | | | | | | Merge "Bump the openstackdocstheme extension to 1.20"Zuul2019-09-254-67/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump the openstackdocstheme extension to 1.20pengyuesheng2019-08-014-67/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some options are now automatically configured by the version 1.20: - project - html_last_updated_fmt - latex_engine - latex_elements - version - release. Change-Id: Ie6b9bdc0cdb6939903920806334f71aa6133c12b
* | | | | | | | | | Add exception log for stack previewSaravanan KR2019-09-211-0/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TripleO uses stack preview for deploy preparation tasks. When there is a error in SoftwareConfig template, 'config' results in null, without any debug or error message. Adding log message to identify such errors easily. Change-Id: I5700e091336fa11c7edcdd575ee27f0a49639ff8
* | | | | | | | | Merge "Add release notes"Zuul2019-09-202-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add release notesricolin2019-09-202-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add release notes for: - Change default designate client version from V1 to V2. - Hidden multiattach property in OS::Cinder::Volume Depends-On: https://review.opendev.org/#/c/682792 Change-Id: I3bb257d7e0c3926aed5df75455f2f2d231dea328
* | | | | | | | | | Merge "Correct availability_zone to be non-mandatory in heat"Zuul2019-09-191-1/+0
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status