summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add segments attribute to OS::Neutron::ProviderNet"Zuul2021-03-152-2/+11
|\
| * Add segments attribute to OS::Neutron::ProviderNetVictor Coutellier2021-03-112-2/+11
| | | | | | | | | | | | | | | | | | Adds a attribute to the neutron ProviderNet resource to get the segments of a provider network. Change-Id: I27656822fd10dffbcaeda016c27a47974313a65d Story: 2007260 Task: 38622
* | Merge "Add Vitrage template resource"Zuul2021-03-155-0/+324
|\ \
| * | Add Vitrage template resourceIfat Afek2020-11-165-0/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VitrageTemplate resource is responsible for adding a Vitrage template. This template can be used, for example, to execute a Mistral healing workflow. Depends-On: If05f0907d8f43f64327c7774170e5b559286fc06 Depends-On: I56560d014a02b5f2ddbc08689d39147fbe4ffca4 Change-Id: Ie862e88ccb82c819b93fa2dbc5f21af61b138046 Story: 2002684 Task: 22504
* | | Merge "Use resource_id instead of phy rsrc name in InstanceGroup"Zuul2021-03-154-14/+4
|\ \ \
| * | | Use resource_id instead of phy rsrc name in InstanceGroupricolin2020-04-164-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use default resource implementation for get_reference_id in: * OS::Heat::InstanceGroup * OS::Heat::AutoScalingGroup * AWS::AutoScaling::AutoScalingGroup Story: #2007007 Task: #37870 Change-Id: I7fd223a3bde1c5d2ecd073124a25675567e406d2
* | | | Merge "Fix avoid deprecation warnings from policy"Zuul2021-03-1411-275/+275
|\ \ \ \
| * | | | Fix avoid deprecation warnings from policyRico Lin2021-03-1211-275/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We received huge amount of warnings during service start. Most about stop using `deprecated_reason` and `deprecated_since` by `policy.DocumentedRuleDefault` directly. And should use them under `policy.DeprecatedRule instead. This patch apply for above suggestion. Also bump oslo.policy lower-constraints and requirements to `3.7.0` to alias policy behavior. Story: 2008707 Task: 42041 Change-Id: Iefcfc30a051fe25ccc5121c7ddb817e8c271fcb6
* | | | | Merge "Switch to collections.abc.*"Zuul2021-03-1228-116/+123
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Switch to collections.abc.*Stephen Finucane2021-02-0128-116/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The abstract base classes previously defined in 'collections' were moved to 'collections.abc' in 3.3. The aliases will be removed in 3.10. Preempt this change now with a simple find-replace: $ ag -l 'collections.($TYPES)' | \ xargs sed -i 's/\(collections\)\.\($TYPES\)/\1.abc.\2/g' Where $TYPES is the list of moved ABCs from [1]. [1] https://docs.python.org/3/library/collections.abc.html Change-Id: Ia282479bb1d466bd2189ebb21b51d91e89b9581e Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
* | | | | Merge "Workaround client race in legacy nested stack delete"Zuul2021-03-115-6/+52
|\ \ \ \ \
| * | | | | Workaround client race in legacy nested stack deleteZane Bitter2019-12-235-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we delete a legacy stack, the delete call may return when a previous delete is still IN_PROGRESS and we are waiting for it to be cancelled - for up to 250s by default plus the time it takes to kill any remaining threads. This means that if the client subsequently sees a DELETE_FAILED status, it can be ambiguous as to whether it refers to the previous delete or the one it just commanded. Work around this when Heat itself is the client (i.e. we are deleting a nested stack). First, put the time the delete started into the status_reason message when the stack goes into the DELETE_IN_PROGRESS state, so that we can distinguish. Then, require the stack to report its status as DELETE_FAILED twice in a row, 10s apart, before we mark it as failed - unless we have definitively seen a different delete commence in the meantime. Change-Id: Ie23ba5f4538a8f5c2e7d64caa6cbe530c013b520 Story: #1669608 Task: 17214
* | | | | | Merge "Ignore old 'vN-branch' tags when scanning for release notes"Zuul2021-03-112-0/+5
|\ \ \ \ \ \
| * | | | | | Ignore old 'vN-branch' tags when scanning for release notesStephen Finucane2020-03-272-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reno has an open TODO [1] to sort branches by something other than alphabetical order. Unfortunately we're hitting this here since heat previously had a 'vN-branch' branch naming scheme, and reno thinks those branches are newer than e.g. 'stable/train'. The solution is to just be stricter in how we select our branches and tags, preventing those with hyphens in them from being accepted. [1] https://github.com/openstack/reno/blob/3.0.0/reno/scanner.py#L850-L852 Change-Id: I75841d0dcb8e69214b7e96cf04f8b095da4d81d2 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
* | | | | | | Merge "Optimise resource type listing"Zuul2021-03-111-42/+44
|\ \ \ \ \ \ \
| * | | | | | | Optimise resource type listingZane Bitter2020-04-301-42/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimise the amount of work needed to filter the list of resource types. Change-Id: If2ccb662a3591336625a3ab0581efbcf2b0ca62e Task: 37976
* | | | | | | | Merge "Remove deprecated tail_log function"Zuul2021-03-111-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove deprecated tail_log functionEyal2020-11-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function has been deprecated for a long time, let's finally remove it. It is only generating a warning anyway. Change-Id: I0f69076ef7c288c113f4e7739c7e12fcfb11d91d
* | | | | | | | | Merge "Fix duplicated words issue like "can be be used""Zuul2021-03-113-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix duplicated words issue like "can be be used"zhufl2020-01-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix the duplicated words issue like "can be be used for load distribution" Change-Id: I3125e1367353b97eaf67386d232e24a31eacab2b
* | | | | | | | | | Merge "Always reset CONF when starting the wsgi app"Zuul2021-03-112-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Always reset CONF when starting the wsgi appHervé Beraud2020-11-172-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that options loaded during any prior run of the application are dropped before being added again during init_application. Change-Id: I968cbe6091856c3090840511e8006af518b99f3a
* | | | | | | | | | | Merge "Fix invalid argument formatting in exception messages"Zuul2021-03-112-13/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix invalid argument formatting in exception messageszhufl2020-11-262-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix the invalid argument formatting in exception messages. Change-Id: I3ed91a4fd22b36815b5cefdd8c9b2fc2a7df4471
* | | | | | | | | | | | Merge "Regenerate trust when update with different user"Zuul2021-03-1112-43/+258
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Regenerate trust when update with different userricolin2020-11-1712-43/+258
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regenerate trust when update stack with different user We will regenerate (and delete old trust) when user credential doesn't match with current context (means different user is operating). Story: #1752347 Task: #17352 Change-Id: I39795bdbd8ab255150153bf8b1e165b49e1a7027
* | | | | | | | | | | | Merge "Use neutron client for server.addresses"Zuul2021-03-112-72/+131
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use neutron client for server.addressesHarald Jensås2021-02-182-72/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The server.addresses (/servers/{server_id}/ips) endpoint can contain stale data causing attribute lookups to fail. This change replaces the use of server.addresses and instead uses the neutron client to list ports with 'device_id' matching the server id. Story: 2008632 Task: 41843 Related: RHBZ#1902230 Change-Id: I1b9293041f2ad92eac0e9bc9646e7b2d7c6f7fd0
* | | | | | | | | | | | | Merge "Fix typo in documentation"Zuul2021-03-111-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix typo in documentationPierre Riteau2021-02-021-3/+3
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I018b75dcd28978e13be33a471be64fae3b31f585
* | | | | | | | | | | | | Merge "Move testing to Fedora 33"Zuul2021-03-115-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move testing to Fedora 33Matthias Runge2021-01-195-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the gate is unblocked, we can also test F33 for gating purposes here. Change-Id: Ie1c9075623d85b27aaf1ac67a3063e219726bc6f
* | | | | | | | | | | | | | Allow deleting Server/DeployedServer without swift/zaqarramishra2021-03-053-19/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When swift and zaqar used for software_config_transport are removed/disabled in the deployment, we should be able to delete Server/DeplpyedServer resources. Change-Id: I4c9e0729f338de67b4b598fcd0e72646289d5025 Task: 2008685
* | | | | | | | | | | | | | Implement secure RBACLance Bragstad2021-03-0224-219/+1220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates default policies to account for system scope and default roles. This is part of a broader change to provide a consistent and secure authorization experience across OpenStack projects. - Introduces basic/reusable check strings in base.py - Implements secure RBAC for build info API - Implements secure RBAC for the action API - Implements secure RBAC for cloud formations - Implements secure RBAC for events - Implements secure RBAC for the resource API - Implements secure RBAC for the service API - Implements secure RBAC for software configs - Implements secure RBAC for software deployments - Implements secure RBAC for stacks - Adds unit tests for legacy and new secure-rbac policies. Change-Id: Iff1e39481ea3b1f00bd89dba4a00aed30334ecec
* | | | | | | | | | | | | | Allow using database configs on db retryRico Lin2021-02-275-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow following db configs when calling wrap_db_retry: * database.db_max_retries * database.db_retry_interval * database.db_inc_retry_interval * database.db_max_retry_interval So database cofig can now control db retries. Please reference [1] for what each config options can do. [1] https://opendev.org/openstack/oslo.db/src/branch/master/oslo_db/options.py Change-Id: I034625733c2d22f0f5635f58e9df3d5785e58cf5
* | | | | | | | | | | | | | Merge "Don't create deployment when changing transport"Zuul2021-02-181-22/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't create deployment when changing transportramishra2021-02-031-22/+9
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier when changing software config transport we used to create a dummy deployment to push the metadata. However this would not work with convergence as we take resource lock for the update which updates the config transport (another engine would try to update the resource metadata for deployment when one engine has locked it). Currently it works when updating transport as we ignore the error in creating dummy deployment, but if there are any new depoyments for the server they would fail. We don't need to push the metadata as it would be pushed when the there is a new/updated deployment. Few additional changes in the patch: - We don't need to ignore the error as servers are now not replaced if the resource is in ERROR when nova server is good/ACTIVE. - Delete the existing tempurls and zaqar queues when changing transport. Task: 41744 Change-Id: Id592b29df36320d8697bd370252ada02612ba7d0
* | | | | | | | | | | | | Fix iter bug with SQlAlchemy 1.3.23Kevin Carter2021-02-181-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With SQlAlchemy 1.3.23 constraint.copy() fails with error[0]. This seems like a regression after[1]. This patch fixes the issue by providing the ``target_table`` argument to c.copy(). [0] http://paste.openstack.org/show/802486 [1] https://github.com/sqlalchemy/sqlalchemy/commit/7dd3381edb15e9699d24d78caa8a1021667ce92d Change-Id: Ia25b8443bbe576f73fb7debe54f307deadf34e04 Signed-off-by: Kevin Carter <kecarter@redhat.com>
* | | | | | | | | | | | Merge "Add openstack-python3-wallaby-jobs-arm64 job"Zuul2021-01-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add openstack-python3-wallaby-jobs-arm64 jobricolin2020-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a non-voting job to validate py3 unittests on ARM64 Task: 41375 Story: 2007938 Change-Id: I41ffb55e31756c53e6c060f88ce70e7a77fe5c0d
* | | | | | | | | | | | | Merge "Imported Translations from Zanata"Zuul2021-01-191-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Imported Translations from ZanataOpenStack Proposal Bot2020-12-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: Id3d93fae5580f839fc819a9aed17fb900c84dc7e
* | | | | | | | | | | | | Merge "Use TOX_CONSTRAINTS_FILE"Zuul2021-01-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use TOX_CONSTRAINTS_FILEricolin2020-11-161-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UPPER_CONSTRAINTS_FILE is old name and deprecated -https://zuul-ci.org/docs/zuul-jobs/python-roles.html#rolevar-tox.tox_constraints_file This allows to use lower-constraints file as more readable way instead of UPPER_CONSTRAINTS_FILE=<lower-constraints file>. [1] https://review.opendev.org/#/c/722814/ Change-Id: I9b1930e867400b11db70016ddb5d79945c2f5ad5
* | | | | | | | | | | | | Merge "Update doc8 version"Zuul2021-01-192-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update doc8 versionwangzihao2021-01-062-2/+2
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The doc8 lib supports Py36 starting from version 0.8.1 Change-Id: Ie6d64485622381031130fa12f963eab5a6a9c555
* | | | | | | | | | | | | Merge "Delete default security groups created by stack."Zuul2021-01-191-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Delete default security groups created by stack.kumari paluru2020-09-291-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default security group gets created during project creation through stack launch. But it's not getting deleted through stack-delete. So added function to delete default security groups created by stack. Closes Bug: #2006692 Change-Id: I00de452057c4589628d963d0e51d44ec9b7ea959
* | | | | | | | | | | | | | Merge "Use assertCountEqual instead of assertItemsEqual"Zuul2021-01-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use assertCountEqual instead of assertItemsEqualshenxindi2020-11-164-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assertItemsEqual method has been removed in Python 3.3 [1] but it was kept alive by unittest2, imported by testtools. For better compatibility, change to assertCountEqual. [1] https://bugs.python.org/issue17866 Change-Id: Id36cde1b617587d743321a94ebc0b8fe6c82e79f
View Lorry Controller Status