14289 Commits

Author SHA1 Message Date
Zuul
d03514e3c8 Merge "Update Zuul branch limit" 2017-12-11 14:13:42 +00:00
Zuul
e614e683a6 Merge "Updated from global requirements" 2017-12-11 14:03:00 +00:00
Zuul
70ff59848c Merge "Protect prepare_update_replace() with resource lock" 2017-12-11 12:51:41 +00:00
ricolin
81a2e4ab43 Allow reserved status for attach check
This issue was due to Nova changes it's volume attach workflow
(https://review.openstack.org/#/c/330285) which allows `reserved`
status.
Closes-Bug: #1737343

Change-Id: I13f1906f53a89586bb51c0b70fa768a9500dfa26
2017-12-11 04:28:54 +00:00
Zane Bitter
b0e18270b4 Protect prepare_update_replace() with resource lock
When we consolidated resource locking with resource state transitions in
a7376f7494b310e9367ebe5dcb43b432a4053023, prepare_update_replace() moved
outside of the locked section, so that other update operations could
potentially conflict with it. This change ensures that we call it while the
lock is still held (if we have transitioned the resource to
UPDATE_IN_PROGRESS, and thus acquired the lock), or that we acquire the
lock before calling it (if UpdateReplace is raised before attempting to
update the resource).

To avoid unnecessary locking and unlocking, we only take the lock if the
Resource plugin has overridden the default handler method (either
restore_prev_rsrc() or prepare_for_replace()), since the defaults do
nothing.

Change-Id: Ie32836ed643e440143bde8b83aeb4d6159acd034
Closes-Bug: #1727127
2017-12-08 11:52:20 +05:30
OpenStack Proposal Bot
74541975c1 Updated from global requirements
Change-Id: I774c2015a728eaa1911475923bad585d3bf6cec2
2017-12-07 13:21:56 +00:00
Zuul
653c130a1d Merge "Updated from global requirements" 2017-12-07 10:47:03 +00:00
Zuul
719c457e40 Merge "Build heat.conf reproducibly" 2017-12-07 09:47:39 +00:00
Zuul
e8ab2d5143 Merge "Fix non-destructive upgrade for deprecated res types in convergence" 2017-12-07 07:37:35 +00:00
Zuul
dc25b6911f Merge "Removed unnecessary setUp() call in tests" 2017-12-06 21:37:17 +00:00
Zuul
4698287a3a Merge "[policy in code] part 4" 2017-12-06 21:37:16 +00:00
Zuul
8b5218c654 Merge "Generate correct name for Sahara cluster" 2017-12-06 17:50:22 +00:00
Zuul
8f6c09df0f Merge "Speed up event listing with nested stacks" 2017-12-06 17:40:25 +00:00
Thomas Goirand
5b98f450a1 Build heat.conf reproducibly
The hostname of the build machine leaks in heat.conf in the host
directive, making the whole heat package not reproducible. If you don't
know about reproducibility, please read here:
https://wiki.debian.org/ReproducibleBuilds/About

This patch therefore sets sample_default to avoid this problem.

Change-Id: Ibfe81f89df75417eab7437817aabd69bfb2985cd
Closes-Bug: #1736761
2017-12-06 18:12:53 +01:00
Zuul
10179a88ec Merge "Eager-load properties for nested resource list" 2017-12-06 11:25:51 +00:00
Zuul
875c717f47 Merge "Ignore resources with non-existent template" 2017-12-06 11:08:46 +00:00
Zuul
3fb7b4eb2e Merge "[policy in code] part3 (resource types)" 2017-12-06 06:43:05 +00:00
Zuul
9950de5d8a Merge "Fix reset_stack_status" 2017-12-06 05:10:51 +00:00
Zuul
03bcacc536 Merge "Remove broken heat.resource_type custom constraint" 2017-12-05 21:48:17 +00:00
Zuul
63148dcf5a Merge "[policy in code] part 2 (stacks)" 2017-12-05 06:49:43 +00:00
OpenStack Proposal Bot
53f7c59892 Updated from global requirements
Change-Id: I9e2c03c7a265eebfa24ab3d3e72cbf993bd6fe3c
2017-12-05 03:03:06 +00:00
Zuul
06b7841b06 Merge "Remove cloudwatch service from devstack plugin" 2017-12-04 23:52:35 +00:00
Zuul
d84db90b80 Merge "Fixes heat-keystone-setup-domain authentication failures with v3" 2017-12-04 09:14:11 +00:00
Thomas Herve
e1a26279ce Fix reset_stack_status
Fix reset_stack_status on legacy, by using a different session for each
stack reset, and handling lock duplicate errors.

Closes-Bug: #1735755
Change-Id: I6bcd7448052e86ec3e4eb4c49ef3139c20d4f919
2017-12-01 17:15:55 +01:00
ricolin
ee56adbd79 Update Zuul branch limit
Now mitaka and newton already mark as EOL, so we should remove any
branch limit that relative to those branches.

Also since we have dependent zuul jobs for each branch, we remove
ocata branch limit from master.

Change-Id: Ide2ddbe4d50faa0356992b55d99c1b1af8a44a35
2017-12-01 10:31:12 +00:00
Zuul
34fe34d8fb Merge "Remove unused attribute 'RESOURCE_TYPE' for tests" 2017-12-01 00:27:48 +00:00
ricolin
51e4f04693 [policy in code] part 4
Add service rule, resource rules, actions rules, build_info rules,
events rules.
Partially-Implements: bp policy-in-code

Change-Id: I497f4d02b5ea8399265dedc548214e4eca6b6a35
2017-12-01 01:34:59 +08:00
ricolin
46f0e16d11 [policy in code] part3 (resource types)
Allow use policy in code to resource type's rule.
Also add test for override the in-code resource type rule in json
file.
Partially-Implements: bp policy-in-code

Change-Id: Id6c21732e66de6c421427ded98de52f5da0a4db2
2017-12-01 01:34:55 +08:00
ricolin
575a45b1c0 [policy in code] part 2 (stacks)
Allow use policy in code to stacks's rule.
Also convert check_is_admin to use new mechanism.
Partially-Implements: bp policy-in-code

Change-Id: I398ed162790294d0d4453f7f12c77b38e95a5580
2017-12-01 01:15:58 +08:00
Zuul
c84c3e3e3a Merge "Updated from global requirements" 2017-11-29 15:36:41 +00:00
Zuul
ea56656481 Merge "Move grenade multinode job out of experimental" 2017-11-29 15:09:26 +00:00
Zuul
83f84db047 Merge "Use heat-tempest-plugin in grenade job" 2017-11-29 12:09:57 +00:00
OpenStack Proposal Bot
664d7c4b66 Updated from global requirements
Change-Id: I6af141926f6b21b384c72512828b950a55ac1e9e
2017-11-29 08:55:40 +00:00
Zuul
28d10ca23e Merge "Use heat-tempest-plugin for integration tests" 2017-11-29 07:47:16 +00:00
rabi
41aad453ef Ignore resources with non-existent template
When listing resources with nested depth, we get all resources
for the root stack and cache them in the context. By the time
we iterate through the resources for a nested stack, if the
current_template_id of resources do not match the stack template,
we try to load the template. However, it's possible that the
template does not exist anymore. It would be good to ignore
those resources.

Change-Id: I838320539838ed74f490bca8601cde96eaf7c7ee
Closes-Bug: #1734815
2017-11-28 12:02:11 +05:30
Zuul
066ab08e81 Merge "Add more logging for software deployment updates" 2017-11-27 17:12:57 +00:00
Zuul
6ce26aeb4d Merge "Remove SSLMiddleware from oslo.config namespace" 2017-11-27 09:50:44 +00:00
Zuul
9d7b88e494 Merge "Zuul: add file extension to playbook path" 2017-11-27 09:20:05 +00:00
befafa3328 Remove SSLMiddleware from oslo.config namespace
Change [1] removed SSLMiddleware from code but
missed removal of oslo-config namespace, this
patch cleans it up.

[1] https://review.openstack.org/#/c/506900/

Change-Id: Ibeeece25a13706e3ce0b58dbb9746090d881b909
2017-11-27 13:05:00 +05:30
Zuul
218c182fbb Merge "Remove SSLMiddleware" 2017-11-27 03:36:19 +00:00
rabi
31ffa13932 Use heat-tempest-plugin in grenade job
Change-Id: I3a3744fa116a2d424b2afd95eb89058ad78d7f0b
2017-11-25 10:35:36 +05:30
rabi
0cbfac7a99 Use heat-tempest-plugin for integration tests
Note: We still have to change grenade jobs to use
the plugin, before removing the plugin from tree.

Change-Id: Ie63f25e724ed3fbd42adcf5bb2d625c2fec67df1
2017-11-25 10:34:53 +05:30
ricolin
48b9753bd5 Zuul: add file extension to playbook path
Zuul now supports including the file extension on the playbook path
and omitting the extension is now deprecrated. Add `.yaml` back for
playbook path.

Change-Id: I4a2ae5f28740e41f5b77c05954e7ea4562016be9
2017-11-24 14:38:03 +08:00
Zuul
f4a06c2a92 Merge "Increase interface detach polling period" 2017-11-24 05:42:32 +00:00
Zuul
8818adb0f5 Merge "Ignore errors in OS::stack_id output" 2017-11-23 13:47:34 +00:00
Zuul
ad1c972f0f Merge "[policy in code] Part 1 Base framework" 2017-11-22 19:01:27 +00:00
Kien Nguyen
cd038a64b9 Move grenade multinode job out of experimental
Change-Id: I5399ededd2938499b0dd155f55a0066c34c486ad
2017-11-22 08:36:47 +07:00
Zane Bitter
34d592b622 Add more logging for software deployment updates
Include the server ID in existing logs, and add additional logs that will
let us know when updates to software deployments have happened and whether
they have succeeded or not. This should save considerable time
investigating in the future if there's ever any question of whether a
deployment has gone missing in Heat itself or somewhere on the target
server.

Change-Id: I33d7aee5974d03b7e41beab9fef4ad643cb0c469
2017-11-21 17:01:42 -05:00
Zuul
099210c3e9 Merge "Updated from global requirements" 2017-11-21 18:33:44 +00:00
Zuul
15fe7f4118 Merge "zuul: add tripleo ovb-ha in experimental pipeline" 2017-11-21 17:17:18 +00:00