Commit Graph

13272 Commits

Author SHA1 Message Date
OpenDev Sysadmins b0bf108ee4 OpenDev Migration Patch
This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:

http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html

Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.
2019-04-19 19:44:35 +00:00
huangtianhua 5034bc10af Get cancellation grace period correctly
This changes the logic of getting cancellation grace
period of task runner before closing it: to move the
liveness check into the cancel_all() method in the
scheduler rather than ask the resource if it's IN_PROGRESS.

Change-Id: Ia2a03de227ff15cdce1b3dbb6cd6bff6c5a50a15
Partial-Bug: 1693495
(cherry picked from commit 8c62e96947)
2017-07-05 01:42:03 +00:00
Jenkins 8cdf5473ac Merge "Ignore property 'metadata' of OS::Heat::DeployedServer" into stable/ocata 2017-07-04 08:32:53 +00:00
huangtianhua 2ca4aad532 Use correct user password as occ credential
Don't generate/update user password again if
the user has already been created, to make sure
the occ credential works.

Change-Id: Iffcb7aa0fb256d36aef64f5fd0ec37af4bf47be8
Closes-Bug: #1697623
(cherry picked from commit e23fcfe93a)
2017-06-20 01:25:57 +00:00
Jenkins c6403967b9 Merge "Fix handle_restore for server and volume resources" into stable/ocata 2017-06-09 08:03:48 +00:00
huangtianhua 4fa52aa9a6 Ignore property 'metadata' of OS::Heat::DeployedServer
The property 'metadata' doesn't make sense for resource
OS::Heat::DeployedServer, because the deployed server can
be provisioned out of nova. The deployment metadata
we can set by resource.metadata, so ignore the
property 'metadata' and do nothing if update it.

We cherry picked from master where we mark deprecated
status for the property 'metadata', and just ignore it
in stable/ocata.

Change-Id: Id218d699a0d49f127243ec537f719dd247197279
Closes-Bug: #1693661
(cherry picked from commit 08e8e790bd)
2017-06-09 10:53:18 +08:00
Jenkins b98af9d464 Merge "Deal correctly with negative elapsed time" into stable/ocata 2017-06-05 09:03:06 +00:00
Jenkins 78f2c47792 Merge "Updated from global requirements" into stable/ocata 2017-06-01 05:39:57 +00:00
Jenkins b54e200d19 Merge "Use six.text_type() instead of str() to serialise status" into stable/ocata 2017-06-01 02:41:20 +00:00
Jenkins 138fafbb81 Merge "Only recreate CHECK FAILED resources in ResourceGroup" into stable/ocata 2017-05-31 16:31:22 +00:00
Jenkins 0209112d7f Merge "Disable ec2 collector for deployed-server" into stable/ocata 2017-05-31 16:31:14 +00:00
Zane Bitter 45b9769212 Use six.text_type() instead of str() to serialise status
Change-Id: Icdcacef27595728b94df7aaf9819f234ad6f2dfa
Closes-Bug: #1692693
(cherry picked from commit 007d4cbfdd)
2017-05-31 14:20:25 +00:00
OpenStack Proposal Bot b0c648c124 Updated from global requirements
Change-Id: I9babf5ae5af142c264576fdb5935880243136136
2017-05-30 18:59:31 +00:00
rabi 437c5e7c4f Fix handle_restore for server and volume resources
When resource references are used for properties restore
does not work for nova server and volume resources.

This patch fixes it and adds a functional test for it.

 Conflicts:
	heat/engine/resources/openstack/nova/server.py

There is very minor conflict in server.py as the code
has been changed in pike for translation refactoring.

Change-Id: I34efb3f4e0d3578d95134793f5c5d413667790e0
Closes-Bug: #1687009
(cherry picked from commit a8129573d2)
2017-05-25 17:16:12 +05:30
Jenkins d06690d72d Merge "Delete internal ports when detach them" into stable/ocata 2017-05-24 10:55:59 +00:00
Jenkins 75962e46bd Merge "Set COMPLETE for failed resource if no update/replace" into stable/ocata 2017-05-24 10:54:47 +00:00
Jenkins 6ebcfb3fe8 Merge "Corrected max secs for concurrent trans retries" into stable/ocata 2017-05-19 10:57:40 +00:00
Zane Bitter c658670773 Deal correctly with negative elapsed time
Since we're comparing local time to database time, we need to correctly
handle negative offsets to account for clock skew. The datetime.timedelta
class always reports a positive number of seconds, but with a possibly
negative number of *days*. Therefore, take the days into account.

Change-Id: I4422e4cf41cb57cdc89548d01b0abc27cda914ef
Closes-Bug: #1688327
(cherry picked from commit f3f05c9a3f)
2017-05-17 20:01:57 +00:00
Thomas Herve d0309937b3 Copy template version when update fails
When an update fails, we may have copy some chunk of resources or
parameters to the new template. If the version was updated and the new
resources require the version, this can lead to a state where the stack
is in an usable state. This synchronizes the version when a failure
happens.

Change-Id: I2faf8f3541fc800ea61c417e5575f4a56a83665b
Closes-Bug: #1620696
(cherry picked from commit 45fde10197)
2017-05-15 09:27:49 +00:00
Zane Bitter 416bad4325 Corrected max secs for concurrent trans retries
This was most likely meant as a max 2s delay here, not a max 2ms
delay.

Also includes a related change: when retries for metadata updates are
attempted, make sure we do not have a stale value of the atomic_key
(otherwise we'll just inevitably hit the ConcurrentTransaction issue).

 Conflicts:
	heat/engine/service_software_config.py

Co-Authored-By: Crag Wolfe <cwolfe@redhat.com>
Partial-Bug: #1651768
Change-Id: Ie56e0e4ff93633db1f4752859d2b2a9506922911
(cherry picked from commit e37d9fab8f)
2017-05-12 16:20:14 -04:00
Jenkins fe6ae385bc Merge "Fix arguments for OS::Mistral::CronTrigger create" into stable/ocata 2017-05-11 04:17:52 +00:00
huangtianhua fc4f2e348e Set COMPLETE for failed resource if no update/replace
Update the status from FAILED to COMPLETE for
resources which do not have to update or replace.

Closes-Bug: #1663522
(cherry picked from commit f05105ec48)

Conflicts:
	heat/engine/resource.py

Change-Id: I9a632691ec8f0682000d704a30039d99d12d71e3
2017-05-03 11:49:29 +08:00
Zane Bitter 54d9e12e5b Fix arguments for OS::Mistral::CronTrigger create
In python-mistralclient, the `workflow_name` argument was renamed to
`workflow_identifier` in version 2.0.0, breaking this resource type. Ensure
that this works with all client versions by passing the first two arguments
as positional rather than keyword args.

Change-Id: Ibbed3af468bbc0d68995495095b6cd340c1ea427
Closes-Bug: #1557575
(cherry picked from commit f682e7afed)
2017-04-28 01:08:12 +00:00
OpenStack Proposal Bot 48e25cba9b Imported Translations from Zanata
For more information about this automatic import see:
http://docs.openstack.org/developer/i18n/reviewing-translation-import.html

Change-Id: I7e18e7078f366fcd10a5bf5ca82c0bbf84f8fd2d
2017-04-24 10:32:30 +00:00
Thomas Herve 0568795758 Store project_domain in project_domain_id
The same way that context was changed to store the attribute in
user_domain_id, use project_domain_id to remove some errors.

Change-Id: I591b6644e113cc90eeb2aff6b628a649ae8d4740
Related-Bug: #1663013
(cherry picked from commit 37b1f7c963)
2017-04-10 08:09:44 +00:00
huangtianhua 434688b7c2 Delete internal ports when detach them
Make sure only to delete internal ports when user
wants to detach them, and just do detach for
external ports.

Change-Id: I09e686d4e1603c6a8b388772eee900f06b1e775d
Closes-Bug: #1676821
(cherry picked from commit b194775ebe)
2017-04-06 14:52:37 +08:00
Jason Dunsmore eb793b613c Only recreate CHECK FAILED resources in ResourceGroup
Previously, ResourceGroup._needs_update() would raise UpdateReplace
when the ResourceGroup was in CHECK_FAILED status, resulting in
delete/replacement of every resource in the group.  Now, it will
return True so that only resources in the CHECK_FAILED  status.

Change-Id: I800c4f58feec7c1aaa4897c2ba056e5a74200e5d
Closes-Bug: #1671592
(cherry picked from commit 362069cd1f)
2017-04-04 16:33:39 -05:00
Jenkins e2a317a6ab Merge "To reset metadata for resources when mark healthy" into stable/ocata 2017-04-03 21:11:05 +00:00
James Slagle 371f843eca Disable ec2 collector for deployed-server
In the deployed-server metadata that configures os-collect-config, the
ec2 collector should not be enabled. ec2 metadata is not typically
available when using the deployed-server resource.

Closes-Bug: #1669842
Change-Id: I33e062b70fdf298908656a8ed3e62ac7cae16a37
(cherry picked from commit 00b82577f1)
2017-03-30 22:03:06 +00:00
Jenkins 84e1669dde Merge "Catch Unauthorized in delete_trust()" into stable/ocata 2017-03-30 10:12:34 +00:00
huangtianhua e139a32799 To reset metadata for resources when mark healthy
We reset the metadata for resources when mark healthy
in change Ibd6c18acf6f3f24cf9bf16a524127850968062bc,
but it doesn't work, because resource policy and group
inherit from multiple class, and the method
'handle_metadata_reset' actually be called now is wrong.

This patch will fix it.

Change-Id: I8583f26b6c8f6c814a00a0a38042484378fa53db
Closes-Bug: #1672596
(cherry picked from commit ebc210375e)
2017-03-24 14:27:57 +08:00
Jenkins 92b4c33f56 Merge "Stop showing json deserialized message in log" into stable/ocata 2017-03-22 02:48:26 +00:00
Jenkins 40e452063e Merge "Pass on outputs errors to parent stacks" into stable/ocata 2017-03-21 23:12:27 +00:00
Jenkins 597d10c014 Merge "Updated from global requirements" into stable/ocata 2017-03-21 19:05:52 +00:00
Jenkins 3e5f3198fc Merge "Still wait for hooks on failed resources" into stable/ocata 2017-03-21 17:28:10 +00:00
Jenkins bd58ec4792 Merge "Store user_domain in self._user_domain_id" into stable/ocata 2017-03-21 07:01:53 +00:00
OpenStack Proposal Bot 18e6980b08 Updated from global requirements
Change-Id: Ib253c2e2ad9e46d2039f62d8abb298c7fb8884c9
2017-03-21 05:04:47 +00:00
Jenkins ad0346fe21 Merge "Reduce wait condition signal number" into stable/ocata 2017-03-21 01:44:36 +00:00
huangtianhua ca1685f3eb Catch Unauthorized in delete_trust()
This change improves the bug fixing
I2376f2702672d28b24de5ac4ad0bb81fd7171abe
to handle the unauthorized exception in delete_trust()
of */heat_keystoneclient.KsClientWrapper.

Change-Id: Ic6fd336f63ae995dd4d76b0f31daa85e86f55ab0
Closes-Bug: #1634362
(cherry picked from commit 2b90a14102)
2017-03-20 15:21:22 +08:00
Zane Bitter 34d46d90a8 Pass on outputs errors to parent stacks
If getting an output from a child stack fails with an error, we didn't pass
on the error message to the parent stack that was requesting it but instead
reported essentially that the given output did not exist.

Change-Id: I5653baf310a29dc4829ad570c769cf67ce12695e
Partial-Bug: #1599114
(cherry picked from commit b90991e00b)
2017-03-16 19:14:02 +00:00
Rico Lin a6ab1c99ff Reduce wait condition signal number
With more then 5% of failure rate in gate. We decide to reduce the possibility
of conflict by reduce the number of signal. Will try to resume the
number back, once we feel confortable.

Change-Id: I90e1d26a67a349f897d895f750d8e57fae98ec1f
(cherry picked from commit 411daeae89)
2017-03-16 03:13:21 +00:00
Thomas Herve 73f299fb49 Sleep between check_resource calls
Instead of calling check_resource on all leaves in the resource graph at
once, sleep a little bit between each call. As it's a tad slower,
delegate it to a thread so that the stack_create RPC message doesn't
timeout when you have lots of resources.

Change-Id: I84d2b34d65b3ce7d8d858de106dac531aff509b7
Partial-Bug: #1566845
(cherry picked from commit 4a500125b3)
2017-03-14 08:23:11 +00:00
Steve Baker 9990fac9e0 Store user_domain in self._user_domain_id
Storing in self._user_domain was actually relying on the
oslo_context.RequestContext also storing in self._user_domain, however
this was renamed in change I203acefae8270bd3373b006fa096bea5ef3106f3
to _user_domain_id.

This change switches to _user_domain_id, which avoids infinite
recursion in the heat tripleo undercloud installer.

Change-Id: I1114611f6765e94dcab74943078066bb096f4078
Closes-Bug: #1663013
(cherry picked from commit b44b0c6970)
2017-03-08 16:23:24 +00:00
ricolin ae4fff5fa6 Stop showing json deserialized message in log
We stop showing json deserialized message in debug log, because
message will involved with some private credential message (like
password). Let's block it for now, until we get a better solution.
Partial-Bug: #1664792

Change-Id: I07410df56449c5414a5572d07507e17f5858c5c6
(cherry picked from commit 1c32b85d54)
2017-03-07 13:10:23 -05:00
Zane Bitter 7ffb87cb3a Still wait for hooks on failed resources
Previously, if a resource was in a FAILED state Heat would set the hook
but not wait for the user to clear it before continuing. It is not clear
what case this was designed to handle, since there's no way that I know
of for the resource to go into a FAILED state while waiting for the
hook.

Change-Id: Iaacc585b9806c08fd5a57c80c10eeb31cb0a8f71
Closes-Bug: #1665699
(cherry picked from commit 5cd7ff3fa6)
2017-03-06 15:02:09 +00:00
Thomas Herve 4608336a6e Try to fix local.conf creation in tests
Change-Id: Ieda609a16d9721f1eb3462212eeb0c46c1474049
(cherry picked from commit d0bd61e46c)
2017-02-24 13:56:36 +00:00
Jenkins 2dd83353c0 Merge "Use region_name when creating keystone client" into stable/ocata 2017-02-16 07:34:49 +00:00
Jenkins 8f6d3c2737 Merge "Add CEPHFS manila share protocol" into stable/ocata 2017-02-15 17:46:36 +00:00
Jenkins 2b97010ef5 Merge "Just to migrate existing resource to backup stack" into stable/ocata 2017-02-15 08:44:03 +00:00
Jan Provaznik b79195de8e Add CEPHFS manila share protocol
Allows to use OS::Manila::Share with share_protocol set to CEPHFS.

Closes-Bug: #1664574
Change-Id: Ia2ece0163a3c25eb28bc0b471cd1797d52fe4e3c
(cherry picked from commit ddb0dff5ab)
2017-02-14 21:35:11 -05:00