summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add Python 3.10 to supported runtime."HEADmasterZuul2023-05-041-0/+1
|\
| * Add Python 3.10 to supported runtime.Takashi Kajinami2023-03-301-0/+1
| | | | | | | | | | | | | | | | Python 3.10 has been tested since 2023.1[1]. [1] https://governance.openstack.org/tc/reference/runtimes/2023.1.html Change-Id: Ib723898169c465ace05381219a51b79e51eadf70
* | Merge "db: Remove layer of indirection"Zuul2023-04-0750-73/+68
|\ \
| * | db: Remove layer of indirectionStephen Finucane2023-03-2550-73/+68
| | | | | | | | | | | | | | | | | | | | | | | | We don't have another ORM to content with here. Simplify 'heat.db.sqlalchemy' to 'heat.db'. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: Id1db6c0ff126859f436c6c9b1187c250f38ebb62
* | | Merge "tests: Enable SQLAlchemy 2.0 deprecation warnings"Zuul2023-04-073-5/+117
|\ \ \ | |/ /
| * | tests: Enable SQLAlchemy 2.0 deprecation warningsStephen Finucane2023-03-253-5/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well, sort of. We enable them but immediately filter out the ones we're actually seeing, the rationale being that we can address these in a piecemeal fashion without the risk of introducing new issues. There's a lot more to be done here. However, the work done in oslo.db [1], nova [2], cinder [2] etc. should provide a guide for how to resolve the outstanding issues. [1] https://review.opendev.org/q/topic:sqlalchemy-20+project:openstack/oslo.db [2] https://review.opendev.org/q/topic:sqlalchemy-20+project:openstack/nova [3] https://review.opendev.org/q/topic:sqlalchemy-20+project:openstack/cinder Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: I5877aa495486ba28519b51d800c0474fd72859a5
* | | Merge "db: Remove legacy migrations"Zuul2023-04-0721-775/+0
|\ \ \ | |/ /
| * | db: Remove legacy migrationsStephen Finucane2023-03-2521-775/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike Cinder, Nova etc., we haven't had any sqlalchemy-migrate-based migrations in Heat for some time. That means we don't need a transition period to handle users that may not have the latest sqlalchemy-migrate-based migration and we can remove these migrations immediately. Doing so also means we can also remove sqlalchemy-migrate from our dependencies. Hurrah! Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: I825c58a42e9d430c9d660dae9bb70d1cb6f91079
* | | Merge "db: Add replacement test for walking migrations"Zuul2023-04-071-0/+103
|\ \ \ | |/ /
| * | db: Add replacement test for walking migrationsStephen Finucane2023-03-251-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this was provided by oslo.db. However, the oslo.db variant only works with sqlalchemy-migrate. We have to provide our own one here. Fortunately, this has already been done in Cinder, Nova etc. and we can duplicate the effort from there. We also add some sanity check logic, while we're here. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: I1ab3fd46d6564b71f4c9c81940943d11e944eb68
* | | Merge "db: Migrate to alembic"Zuul2023-04-067-223/+160
|\ \ \ | |/ /
| * | db: Migrate to alembicStephen Finucane2023-03-257-223/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is significantly easier than Cinder, Nova etc. as Heat hasn't had any database migrations in multiple cycles, meaning we don't need to worry about having to apply any older sqlalchemy-migrate migrations before switching to alembic. Instead, we simply need to determine we're upgrading a deployment that was previously using sqlalchemy-migrate, upgrading a deployment that has already migrated to alembic, or deploying a new deployment, adjusting accordingly. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: I808af9cb21ba21808209b1daddac7426f4cad310
* | | Merge "Hide resource types for Neutron LBaaS v2"Zuul2023-04-068-7/+55
|\ \ \
| * | | Hide resource types for Neutron LBaaS v2Takashi Kajinami2023-04-038-7/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neutron LBaaS v2 was retired a long ago and users are no longer able to use these resource types. Story: 2010678 Task: 47759 Change-Id: I9c9cdcbe6cb1019714dbb4cfc05c0c68ac2ff934
* | | | Merge "db: Sync alembic, sqlalchemy-migrate migrations"Zuul2023-04-061-52/+56
|\ \ \ \ | | |/ / | |/| |
| * | | db: Sync alembic, sqlalchemy-migrate migrationsStephen Finucane2023-03-231-52/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alembic's auto-generate functionality doesn't preserve index names or column order. This causes comparisons between databases to fail. Update the initial alembic migration to match the schema's generated by sqlalchemy-migrate. Change-Id: Ie8d98731c61434e85896062fe05137cbadf0eaa5
* | | | Merge "db: Add initial alembic migration"Zuul2023-04-061-0/+388
|\ \ \ \ | |/ / /
| * | | db: Add initial alembic migrationStephen Finucane2023-03-231-0/+388
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was generated using a different method to the one I've used previously [1][2]. Instead of manually converting sqlalchemy-migrate calls to alembic equivalents, we generate it automatically based on our models using alembic's auto-generate functionality: alembic --config heat/db/sqlalchemy/alembic.ini \ revision -m 'Initial revision 2' alembic --config heat/db/sqlalchemy/alembic.ini \ upgrade head alembic --config heat/db/sqlalchemy/alembic.ini \ revision -m 'Initial revision 2' --autogenerate The two files were then combined, formatting and imports adjusted, and schema of this and the sqlalchemy-migrate migrations compared. The latter step was done by comparing the schemas of a database created by the sqlalchemy-migrate tool to the one created by alembic: python heat/db/sqlalchemy/migrate_repo/manage.py version_control \ sqlite:///heat-old.db heat/db/sqlalchemy/migrate_repo/ 072 python heat/db/sqlalchemy/migrate_repo/manage.py upgrade \ sqlite:///heat-old.db heat/db/sqlalchemy/migrate_repo With the two databases created, we can compare them using the methodologies described in [3]. [1] https://review.opendev.org/c/openstack/nova/+/799527 [2] https://review.opendev.org/c/openstack/cinder/+/786931 [3] https://that.guru/blog/comparing-nova-db-migrations/ Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: Ie32fbb42576760f2c4a52d8305823b99df2b41ba
* | | | Merge "db: Wire up for auto-generation"Zuul2023-03-301-6/+4
|\ \ \ \ | |/ / /
| * | | db: Wire up for auto-generationStephen Finucane2023-03-231-6/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: Ic1544f3c5af482c8931b77a7faea059cc3c497dc
* | | | Merge "db: Add initial alembic configuration"Zuul2023-03-306-4/+191
|\ \ \ \ | |/ / /
| * | | db: Add initial alembic configurationStephen Finucane2023-03-236-4/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No migrations yet: this is simply the output of 'alembic init' with some minor tweaks. A note about ordering of requirements is removed from requirements.txt: it is no longer true with the new dependency resolver introduced in pip 20.3. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: I7790222ab5eaf6c47dd386fe472275a3037a9898
* | | | Merge "db: Remove unused util methods"Zuul2023-03-302-282/+0
|\ \ \ \ | |/ / /
| * | | db: Remove unused util methodsStephen Finucane2023-03-232-282/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are unused since change Icdab0db3f3371cd4eb8a8fb11cbc2328c0a830e7 way back in 2016. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: I2e337ff0fbbded0c0cd42060aa35b4e0787d0d5f
* | | | Merge "Integrate pre-commit"Zuul2023-03-297-10/+41
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Integrate pre-commitStephen Finucane2023-03-227-10/+41
| | | | | | | | | | | | | | | | | | | | | Makes my life easier wrt testing. Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Change-Id: I5a79494eb81622be5e56686a1995eb2f0bddb085
* | | Merge "Disable unstable test cases in grenade"Zuul2023-03-241-2/+0
|\ \ \ | |/ / |/| |
| * | Disable unstable test cases in grenadeTakashi Kajinami2023-03-231-2/+0
| |/ | | | | | | | | | | | | | | | | | | | | Some test have been unstable in Ubuntu Jammy because of the known libvirt bug, and we have disabled these in functional jobs. Let's disable the test case in grenade jobs, because these test cases now cause frequent job failures. Related-Bug: #1998274 Change-Id: I7038ce3ec2840b133e9ae5eb09a96dc8a5f3abc2
* | Merge "fix wrong attribute in heat senlin client"Zuul2023-03-174-24/+26
|\ \ | |/ |/|
| * fix wrong attribute in heat senlin clientBui Doan Dang2023-03-094-24/+26
| | | | | | | | | | | | | | | | | | | | | | Heat has been using the deprecated interfaces of openstacksdk for some Senlin APIs but these interfaces were already removed. This fixes that problem and replace the removed interfaces by the new ones. story: 2010635 task: 47602 Change-Id: I3b18de721949f3c15c776f90720f3e994f7d6670
* | Imported Translations from ZanataOpenStack Proposal Bot2023-03-113-6/+141
| | | | | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I7eaf3a7f75d0eff695ae6cfb13e986bdadf13f2d
* | Merge "Disable B113 rule of bandit"Zuul2023-03-101-2/+4
|\ \
| * | Disable B113 rule of banditTakashi Kajinami2023-03-101-2/+4
| |/ | | | | | | | | | | | | | | | | | | The new release of bandit just came out which introduced the new rule, with which unfortunately heat is not compliant now. This disables the rule temporally so that we can avoid adapting our stable branches to new lint rules by backporting this. Change-Id: I4a27049d40760ad8da6fda24e1195e26ef9c6c17
* | Merge "Update master for stable/2023.1"Zuul2023-03-092-0/+7
|\ \
| * | Update master for stable/2023.1OpenStack Release Bot2023-03-072-0/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | Add file to the reno documentation build to show release notes for stable/2023.1. Use pbr instruction to increment the minor version number automatically so that master versions are higher than the versions on stable/2023.1. Sem-Ver: feature Change-Id: I66c13d91cee78725f6cf856f66382c7391ed5c26
* | Fix unit tests with python-novaclient 18.3.0Takashi Kajinami2023-03-091-11/+41
|/ | | | | | | | | python-novaclient 18.3.0 replaced usage of kwargs by explicit arguments and that broke some assertions of arguments. story: 2010638 task: 47613 Change-Id: I039d1e672611b7b523ce61df072c60d161851eed
* Merge "Return HTTPBadRequest from circular dependency"20.0.0.0rc1Zuul2023-03-072-1/+49
|\
| * Return HTTPBadRequest from circular dependencyTobias Urdin2023-02-272-1/+49
| | | | | | | | | | | | | | | | | | | | | | We don't map the CircularDependencyException to a 400 Bad Request in the fault middleware so users can never get an understand of what is wrong in their template. They are today instead present with a 500 internal server error without details which doesn't help them. Change-Id: Idc8713b4c29e2534dd7059e4566ac3b777f418e5
* | Merge "Move CircularDependencyException to common"Zuul2023-03-075-15/+14
|\ \ | |/
| * Move CircularDependencyException to commonTobias Urdin2023-02-275-15/+14
| | | | | | | | | | | | | | | | Moves the exception from inside the engine code to the common code so that we can use it in the API fault middleware. Change-Id: I017b95153c358829501f6a5740918cdb005fb32f
* | Merge "fix heat update senlin cluster"Zuul2023-03-062-6/+6
|\ \
| * | fix heat update senlin clusterBui Doan Dang2023-03-062-6/+6
| | | | | | | | | | | | | | | | | | | | | story: 2010578 task: 47331 Change-Id: I3706d662ec56e3548eb991556be7bd0f82f49e05
* | | Merge "Fix parsing of live data from OS::Nova::Server"Zuul2023-03-061-1/+11
|\ \ \
| * | | Fix parsing of live data from OS::Nova::ServerPavlo Shchelokovskyy2023-03-061-1/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | depending on compute API version, flavor in the instance representation may not have "id" field, but "original_name" instead. Story: 2009753 Task: 44211 Change-Id: Ieeae2f36f5e59e01f57a2f8e66a983ec3d99ec63
* | | Merge "Skip basic scenario test"Zuul2023-03-061-1/+2
|\ \ \ | |/ /
| * | Skip basic scenario testTakashi Kajinami2023-03-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test is very frequently failing now. The test case creates a stack with an instance but the stack can't be deleted within timeout because of the known libvirt bug in Ubuntu Jammy. Because the release deadline is already over, we'll disable this test so that we can merge some changes now. We'll revisit this (and the other test cases we disabled) later. Related-Bug: #1998274 Story: 2010631 Task: 47589 Change-Id: I87c4b1e7a911fd78e327393b1af200667e89c999
* | | Merge "Added a unit test for get_environment_hidden_param"Zuul2023-03-021-0/+50
|\ \ \
| * | | Added a unit test for get_environment_hidden_paramChengen Du2023-02-161-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A unit test for verifying that hidden parameters should be masked in the get stack environment API Story: 2010555 Task: 47229 Change-Id: I44ef26849ebb450a5643907a0ef47166cfd9b1cb
* | | | Merge "Update release note of task 47052"Zuul2023-03-011-1/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update release note of task 47052Takashi Kajinami2023-02-151-1/+3
| |/ / | | | | | | | | | | | | | | | | | | The previous content is not very accurate because the fix is made in API layer instead of the CLI command. Change-Id: I0abbd535aacc03446ada0fa806dfdfdaa4522afe
View Lorry Controller Status