summaryrefslogtreecommitdiff
path: root/heat
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Ignore RESOLVE translation errors when deleting resources"Zuul2018-08-051-1/+2
|\
| * Ignore RESOLVE translation errors when deleting resourcesrabi2018-07-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | Sometimes when deleting resources, we use parent resources in api calls. If the parent resource is deleted then the children could be assumed to be deleted. So ignore those translations errors and return unresolved values when accessing properties. Change-Id: I2392b5c46920ac6da518fe33bdcba3e7a9fe17a8 Story: #1747836 Task: 23278
* | Merge "Eliminate client races in legacy operations"Zuul2018-08-035-38/+124
|\ \
| * | Eliminate client races in legacy operationsZane Bitter2018-07-305-38/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait for the legacy stack to move to the IN_PROGRESS state before returning from the API call in the stack update, suspend, resume, check, and restore operations. For the stack delete operation, do the same provided that we can acquire the stack lock immediately, and thus don't need to wait for existing operations to be cancelled before we can change the state to IN_PROGRESS. In other cases there is still a race. Change-Id: Id94d009d69342f311a00ed3859f4ca8ac6b0af09 Story: #1669608 Task: 23175
* | | Merge "Always start convergence worker service"Zuul2018-08-032-14/+15
|\ \ \
| * | | Always start convergence worker serviceZane Bitter2018-07-312-14/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of the cfg.CONF.convergence_engine option is to determine whether new stacks will be created using convergence or not. For some reason, however, the worker service was not started when the option was disabled, meaning that previously-created convergence stacks could no longer be updated (there was a hack in place to allow them to be deleted). Always start the worker service and continue operating any existing convergence stacks in convergence mode, regardless of the current setting for new stacks. Change-Id: Ic3574e4d15ac48b2bc8e0e8101c81d24f40f0606 Related-Bug: #1508324
* | | Unit tests: Fix slow Manila testZane Bitter2018-07-311-2/+7
|/ / | | | | | | | | | | | | | | | | We were retrying the create due to the client_plugin being mocked out, which resulted in the test taking >60s instead of ~0.3s. Change-Id: I14d0a88b94f7e56e03683021c9c29a55dac9e516 Story: #1745010 Task: 23347
* | Eliminate client race condition in convergence deleteZane Bitter2018-07-305-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when doing a delete in convergence, we spawned a new thread to start the delete. This was to ensure the request returned without waiting for potentially slow operations like deleting snapshots and stopping existing workers (which could have caused RPC timeouts). The result, however, was that the stack was not guaranteed to be DELETE_IN_PROGRESS by the time the request returned. In the case where a previous delete had failed, a client request to show the stack issued soon after the delete had returned would likely show the stack status as DELETE_FAILED still. Only a careful examination of the updated_at timestamp would reveal that this corresponded to the previous delete and not the one just issued. In the case of a nested stack, this could leave the parent stack effectively undeletable. (Since the updated_at time is not modified on delete in the legacy path, we never checked it when deleting a nested stack.) To prevent this, change the order of operations so that the stack is first put into the DELETE_IN_PROGRESS state before the delete_stack call returns. Only after the state is stored, spawn a thread to complete the operation. Since there is no stack lock in convergence, this gives us the flexibility to cancel other in-progress workers after we've already written to the Stack itself to start a new traversal. The previous patch in the series means that snapshots are now also deleted after the stack is marked as DELETE_IN_PROGRESS. This is consistent with the legacy path. Change-Id: Ib767ce8b39293c2279bf570d8399c49799cbaa70 Story: #1669608 Task: 23174
* | Merge "Delete snapshots using contemporary resources"Zuul2018-07-303-15/+63
|\ \
| * | Delete snapshots using contemporary resourcesZane Bitter2018-07-243-15/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting a snapshot, we used the current resources in the stack to call delete_snapshot() on. However, there is no guarantee that the resources that existed at the time the snapshot was created were of the same type as any current resources of the same name. Use resources created using the template in the snapshot to do the snapshot deletion. This also solves the problem addressed in df1708b1a83f21f249aa08827fa88a25fc62c9e5, whereby snapshots had to be deleted before the stack deletion was started in convergence because otherwise the 'latest' template contained no resources. That allows us to once again move the snapshot deletion after the start of the stack deletion, which is consistent with when it happens in the legacy path. Amongst other things, this ensures that any failures can be reported correctly. Change-Id: I1d239e9fcda30fec4795a82eba20c3fb11e9e72a
* | | Merge "Ignore RESOLVE translation errors when translating before_props"Zuul2018-07-304-14/+57
|\ \ \ | | |/ | |/|
| * | Ignore RESOLVE translation errors when translating before_propsrabi2018-07-304-14/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When translating name to id, if we don't find the resource it's better to ignore the error and return the non-translated value for before properties. Change-Id: Ic25c35098cff8b68e184a336b21f2e8df70bb1ee Story: #2003015 Task: 23103
* | | Merge "zun: add property 'networks' to container"Zuul2018-07-284-13/+425
|\ \ \
| * | | zun: add property 'networks' to containerHongbin Lu2018-07-274-13/+425
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new property 'networks' to resource OS::Zun::Container. This property is an ordered list of nics to be added to this container, with information about connected networks, fixed ips, port etc. This property can be updated without replacement. Story: 2003106 Task: 23222 Change-Id: I4b8c0257b83e97444dd8ff6ce88e240d12278ec2
* | | | Merge "Enhancements to CIDR and IP address constraints."Zuul2018-07-274-17/+43
|\ \ \ \
| * | | | Enhancements to CIDR and IP address constraints.Nakul Dahiwade2018-07-254-17/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the constraints do not reject an ipaddress for ipv4 which have fewer than 3 dots such as 'a' or 'a.b' or 'a.b.c'. This enhancement provides an extra check that an ipv4 address has syntax: 'a.b.c.d' This also applies to CIDR Change-Id: Ia7ec8bf107abd169b6b6a91d0b8bb913fc3cc7b9 Story: 2002552 Task: 22114
* | | | | Merge "Convert bytes_used to int before comparison"Zuul2018-07-271-1/+1
|\ \ \ \ \
| * | | | | Convert bytes_used to int before comparisonrabi2018-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7fab8c0b3fbda60f68e0b1fef8a2befd2183433d
* | | | | | Merge "zun: use containers.update for renaming"Zuul2018-07-274-11/+52
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | zun: use containers.update for renamingHongbin Lu2018-07-244-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old way of renaming is duplicated [1]. This patch uses the new way to rename a container. In addition, this patch also bump the version of python-zunclient to 2.0.0 [1] https://review.openstack.org/#/c/557595/ Change-Id: I4ef36a3c4a805b3e041fcb9456c297e59865485c
* | | | | | Merge "Hidden resources in Rocky"11.0.0.0b3Zuul2018-07-274-20/+36
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Hidden resources in Rockyricolin2018-07-264-20/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resource type ``OS::Magnum::Bay`` is now hidden, please use ``OS::Magnum::Cluster`` instead. Resource type ``OS::Magnum::BayModele`` is now hidden, please use ``OS::Magnum::ClusterTemplate`` instead. Resource type ``OS::Nova::FloatingIP`` is now hidden, please use ``OS::Neutron::FloatingIP`` instead. Resource type ``OS::Nova::FloatingIPAssociation`` is now hidden, please use ``OS::Neutron::FloatingIPAssociation`` instead. Change-Id: I2ea1400cfe1f4eca24f2fb7b4b0ec27ca5e9538d
* | | | | | Merge "Option for retrieving child templates and env files from swift"Zuul2018-07-2714-105/+334
|\ \ \ \ \ \
| * | | | | | Option for retrieving child templates and env files from swiftrabi2018-07-2614-105/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides an option to specify a swift container for stack actions and all child templates and env files will be fetched from the container, if available. However, files coming in the 'files' map from the client will have precedence, if the same is also present in swift. Change-Id: Ifa21fbcb41fcb77827997cce2d5e9266ba849b17 Story: #1755453 Task: 17353
* | | | | | | Merge "Add Blazar client plugin to Heat"Zuul2018-07-272-0/+84
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add Blazar client plugin to Heatkaz_shinohara2018-07-122-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a Blazar client plugin which will be used by a couple of Balazar resources under development. Change-Id: I0f68fc0525db3ba299d77019a102f24b9d3cea87 Task: 19754 Story: 2002085
* | | | | | | Merge "Add a new OS::Heat::Delay resource type"Zuul2018-07-272-0/+326
|\ \ \ \ \ \ \
| * | | | | | | Add a new OS::Heat::Delay resource typeZane Bitter2018-07-242-0/+326
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to insert a delay at some point in the workflow while creating or deleting the stack. Unlike OS::Heat::TestResource, the delay can be randomised so that when used in parallel across a scaling group it can be used to work around thundering herd problems. Change-Id: I49deb9560df9963120445c5900f79a1c5ca09cb5
* | | | | | | Merge "OS::Nova::Server: Extend addresses attr to include network"Zuul2018-07-252-10/+57
|\ \ \ \ \ \ \
| * | | | | | | OS::Nova::Server: Extend addresses attr to include networkHarald Jensås2018-07-202-10/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds 'network' to the addresses attribute of the OS::Nova::Server resource. This enables resolving the properties of the neutron network for the server resource. Story: 1766946 Task: 19690 Change-Id: I5bef751982919103ecbefeee64bf0f2cbede0cd0
* | | | | | | | Merge "Ignore NotFound error in prepare_for_replace"Zuul2018-07-252-5/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Ignore NotFound error in prepare_for_replacerabi2018-07-212-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the port is already deleted in neutron, we don't need to do anything. Change-Id: I9275610931a174919076330ec443f54f68cc1371 Story: #2003015 Task: 23035
* | | | | | | | | Merge "Retry resource creation on conflict"Zuul2018-07-252-5/+25
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Retry resource creation on conflictZane Bitter2018-06-182-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If resource creation fails with an HTTP Conflict error, this is presumably due to a race condition with one of the underlying services. In this case, allow Heat to retry the resource creation so that hopefully in most cases the user will never have to deal with the error. Change-Id: I301bb28231fcdc249f86ec1a2f09cb993023785b Story: #1745010 Task: 17344
* | | | | | | | | Merge "Define constants for Neutron client resource types"Zuul2018-07-2427-127/+192
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Define constants for Neutron client resource typesZane Bitter2017-11-0627-127/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use named constants to pass as the 'resource' parameter to the find_resourceid_by_name_or_id() method of the Neutron client plugin. Apart from making everything more explicit and less error-prone, this also provides clarity on the meaning of obtuse names like 'policy' (QoS, not any other kind of policy) or 'pool' (load balancer, not subnet). Change-Id: If9b5528835775d303db477fafabf3ed6bd224bd0
* | | | | | | | | Merge "Docs: Eliminate warnings in docs generation"Zuul2018-07-2314-61/+70
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Docs: Eliminate warnings in docs generationZane Bitter2018-06-2114-61/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix all of the existing sphinx warnings, and treat warnings as errors in future. Change-Id: I084ef65da1002c47c7d05a68d6f0268b89a36a7a Depends-On: https://review.openstack.org/553639 Depends-On: https://review.openstack.org/559348
* | | | | | | | | | Merge "OS::Neutron::Port: Add network attribute"Zuul2018-07-232-2/+84
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | OS::Neutron::Port: Add network attributeHarald Jensås2018-07-202-2/+84
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds attribute 'network' to the port resource. Similar to the existing subnets attribute which returns a list of all subnets. The network attribute returns the properties of the neutron network. Story: 1766946 Task: 18792 Change-Id: I6c667a0ff2c15aa27ca0d7943359e7f595630f87
* | | | | | | | | Merge "Fix server_group create issue"Zuul2018-07-201-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix server_group create issuetpatil2018-07-191-2/+3
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Heat uses python-novaclient version 10.3.0 in which 2.64 microversion changes [1] are not included but heat-engine still gets 2.64 compute API version from client (queries nova api service) resulting in failure in creating server group. Fixed this issue by explicitly using 2.15 api version to create server_group. [1] : https://github.com/openstack/python-novaclient/commit/839da6fec02182fa3c6d51460099ac4f7ebb500d#diff-815379030879ca27268b9336fecbe7dc Change-Id: I30b9fc4dd96470832f5e7516179021fbe11c63bc Story: #2003017
* | | | | | | | Revert "Remove unittests monasca until story/2002978 is released"Rico Lin2018-07-184-0/+586
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b6197161b5228803f247728a2fa6689ed69635ee. Depends-On: https://review.openstack.org/#/c/583433 Change-Id: I1f21bd57b3df4c0d1778fe8907e402f5de7eaa77
* | | | | | | Remove unittests monasca until story/2002978 is releasedrabi2018-07-174-586/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3399adb0c78fdcac77654560cfafd77eb4e9d009 Story: #2002978
* | | | | | | Merge "Refactor condition expression in Resource.load()"Zuul2018-07-131-4/+6
|\ \ \ \ \ \ \
| * | | | | | | Refactor condition expression in Resource.load()Zane Bitter2018-04-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even I get confused by this code, and I wrote it. Change-Id: I055b7a51de6f1e8c380c52d43233d3d0c3abb0ea
* | | | | | | | Merge "Fix Octavia health manager"Zuul2018-07-121-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Octavia health managerFeilong Wang2018-07-071-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently, there is a change[1] in Octavia which adding new validation to forbid using HTTP method, expectation code and URL path for non-HTTP type health monitor. For example, if user is using TCP as the type of health monitor and now Heat is using default values for HTTP_METHOD, EXPECTED_CODES and URL_PATH, which will cause error response from Octavia. And the stack creation will fail. This patch fixes it by removing those default values. [1] https://github.com/openstack/octavia/commit/e1e1640af541dfdf12c62eccf5e355423273261c Task: 22876 Story: 2002904 Change-Id: Id61cde4c1416cc65b4eac90710f564699ada6a75
* | | | | | | | | Merge "Fix stack delete error with none cluster"Zuul2018-07-122-5/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix stack delete error with none clusterliyi2018-06-222-5/+14
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before stack delete, I delete cluster first, and then stack delete failed. Change-Id: I523575668e5f52728116c68761aa221cb27fa132 Story: #2002623 Task: 22253
View Lorry Controller Status