14182 Commits

Author SHA1 Message Date
Jenkins
8b2136451d Merge "Add release note for StackDefinition API" 2017-10-13 03:34:46 +00:00
Jenkins
299fc8afc4 Merge "Updated from global requirements" 2017-10-13 03:20:00 +00:00
OpenStack Proposal Bot
e07fcda5de Updated from global requirements
Change-Id: I51d159a446bc99fd98e1f27df9f55f7977fc4bcd
2017-10-12 21:53:25 +00:00
ricolin
a4f2dccf0e Correct example for list_concat-unique function
Change-Id: I330a265a16b0d7a2ac9f94e859f7b81f1e193dc5
2017-10-12 18:56:27 +08:00
rabi
40377ff81d Fix regex for updated_time in PATCH update api test
Change-Id: I2d7a6a3613ed218ca561dc30840e3824d5ce1bd2
Related-Bug: #1721692
2017-10-10 14:24:56 +05:30
Jenkins
8188f53401 Merge "Allow convergence-specific Tempest tests" 2017-10-09 16:27:40 +00:00
Jenkins
32345069a8 Merge "Add action_wait_secs for update" 2017-10-09 11:09:16 +00:00
Jenkins
50379b7f08 Merge "Avoid cloudwatch endpoint retrieve when disabled" 2017-10-09 07:41:05 +00:00
Jenkins
b7bb2752fe Merge "API Tests: Ensure updated_time changes in stack patch update" 2017-10-09 06:09:08 +00:00
rabi
427c34401f Add action_wait_secs for update
Add action_wait_secs for TestResource in api tests, so
that consecutive updates would have different updated_time.

Change-Id: I08d2ac6625acaa0828b18b5e805c81031bb87c01
Related-Bug: #1721692
2017-10-09 10:33:27 +05:30
OpenStack Proposal Bot
bdade04310 Imported Translations from Zanata
For more information about this automatic import see:
https://docs.openstack.org/i18n/latest/reviewing-translation-import.html

Change-Id: I05160666e877e2c7540251a71e69b7307ae6f582
2017-10-07 11:22:47 +00:00
ricolin
691b726c5f Remove redundant null engine id check
if `lock != self.LOCK_NONE` is true here then
`self._calling_engine_id is None` will alway be true.

Change-Id: I9a9158c4b135f0890807f63784468c069d320c52
2017-10-07 16:32:23 +08:00
Jenkins
6c50ea6acd Merge "Fix get_watch_server_url for ipv6 addresses" 2017-10-06 20:47:20 +00:00
Zane Bitter
5d43c6c8de API Tests: Ensure updated_time changes in stack patch update
Check that the patch update has actually run and that we're not simply
looking at the UPDATE_COMPLETE status from the previous test, otherwise
the outputs may not have been updated before we run the next test.

Change-Id: Ia45a303e74e19e7d1887c4e242a8ee5655208e59
Closes-Bug: #1721692
2017-10-06 15:14:09 -04:00
Zane Bitter
dfd34a00f3 Allow convergence-specific Tempest tests
Add a "convergence_engine_enabled" configuration option to the functional
tests' Tempest plugin. The option is enabled by default, but can be
disabled by setting the DISABLE_CONVERGENCE environment variable to "true"
when running prepare_test_env.sh, so that if convergence is disabled in
devstack it will also be disabled in Tempest.

This will allow us to write functional tests for convergence-specific (or
non-convergence-specific) behaviours.

Change-Id: If3a37de75467d50af10582215e16611e59a4ad06
2017-10-05 14:19:32 -04:00
Alfredo Moralejo
54ac107d7f Fix get_watch_server_url for ipv6 addresses
https://review.openstack.org/#/c/508021 fixed it
to work in uwsgi mode but did broke it to work with
ipv6 as it contains ':' as part of the host.

This patch fixes how the URL is parsed in order to
work properly with ipv6.

Change-Id: I3965ee83e1f743e25cbdcbbec516be0ed6a30afc
Closes-Bug: #1721045
2017-10-05 14:33:52 +02:00
Jenkins
163d85a3ca Merge "Use a namedtuple for convergence graph nodes" 2017-10-05 07:33:15 +00:00
Jenkins
d6f9ad1940 Merge "Don't use Dependencies repr in tests" 2017-10-05 07:33:06 +00:00
Jenkins
b59a76bbd9 Merge "Fix error for invalid auth_encryption_key" 2017-10-05 06:51:17 +00:00
Jenkins
05bad04878 Merge "Make private flavor tenant access works" 2017-10-05 05:23:14 +00:00
rabi
9762cc6ac4 Skip test_notifications.NotificationTest.* functional tests
Change-Id: I4cb4b03adef132c11ca664676b6e03ad3efe60d2
Related-Bug: #1721202
2017-10-04 13:26:18 +05:30
Jenkins
dd22ab2fc6 Merge "Adds 5 backport db migration place holder for Pike" 2017-09-28 05:05:35 +00:00
Jenkins
876c046332 Merge "Don't load resource data for list_outputs" 2017-09-27 15:42:10 +00:00
Jenkins
f5268b3eb2 Merge "Use show_output in TemplateResource.get_reference_id()" 2017-09-27 15:42:02 +00:00
Jenkins
390e846c8b Merge "Speed up show-stack with outputs in legacy path" 2017-09-27 15:41:54 +00:00
Zane Bitter
78fb3c42ca Add release note for StackDefinition API
Change-Id: I00f71f9b47690d9e9fcbd8aeae2289de34d87c60
Implements: blueprint stack-definition
2017-09-27 10:12:27 -04:00
Jenkins
9195ead9bf Merge "Make sure we can get watch server url in uwsgi mode" 2017-09-27 13:02:43 +00:00
huangtianhua
13cd27a955 Make private flavor tenant access works
Make private flavor tenant access works.

Change-Id: Ibcb82d3518320534e9e0397e9d0651c3b602d439
Closes-Bug: #1719805
2017-09-27 16:47:26 +08:00
ricolin
4a6aecc5df Fix translate tenants in flavor
Closes-Bug: #1719762

Change-Id: Ibb5a1d176de30bb82bb874f0d66f181251fa5b11
2017-09-27 10:44:00 +08:00
Zane Bitter
6a176a270c Use a namedtuple for convergence graph nodes
The node key in the convergence graph is a (resource id, update/!cleanup)
tuple. Sometimes it would be convenient to access the members by name, so
convert to a namedtuple.

Change-Id: Id8c159b0137df091e96f1f8d2312395d4a5664ee
2017-09-26 16:46:17 -04:00
Zane Bitter
d64de0e4e1 Don't use Dependencies repr in tests
Change-Id: I92fb9928bf839568bb3e4cfb547ddbb579b991cf
2017-09-26 16:46:17 -04:00
Zane Bitter
166ac7869f Increase interface detach polling period
The gate has started failing due to interface detaches timing out.
Examining the logs, it looks like Nova's interface detach retry takes about
6s to run one attempt. Heat, on the other hand, does 10 retries at 0.5s
intervals. So if Nova has to retry then Heat will fail.

Increase Heat's polling interval to make it more likely that if Nova
succeeds, Heat will see it.

Change-Id: Ie74980a3f806b8c17e4e494ae979725b0078f135
Closes-Bug: #1585858
2017-09-26 13:26:13 -04:00
Zane Bitter
f1961c734e Use show_output in TemplateResource.get_reference_id()
TemplateResource is unique in that it can return a custom reference ID
defined as an output in the nested template. This was being fetched by the
StackResource.get_output() method, which also has the effect of retrieving
*all* of the outputs of the nested stack and caching them in memory in case
something else were to reference any of them.

Unfortunately when calculating the resource data for a stack (which we
must always do when e.g. showing the outputs), we always include the
reference IDs of all resources, regardless of whether they are referenced
by get_resource in the data we are looking to populate. (In fact, we have
no way from the Template API to distinguish where get_resource is used on
a particular resource, only where there are dependencies on it.) This is no
problem under the assumption that getting the reference ID is quick, but
that assumption does not hold for TemplateResource.

The show_output RPC call only retrieves a single output (as opposed to
show_stack, used in StackResource.get_output(), which calculates all of
them). Fall back to that call in TemplateResource.get_reference_id() if the
outputs are not already cached to avoid unnecessary overhead in the common
case.

Attribute values are now always fetched before the reference ID, so that we
won't end up making two RPC calls in the case where we also need to read
other outputs.

Change-Id: I66da13c0bb024749de4ae3f0c4b06ebb485cee37
Closes-Bug: #1719333
2017-09-25 13:55:41 -04:00
Zane Bitter
9b5f66351f Don't load resource data for list_outputs
This RPC call only generates a list of the outputs defined in the template,
not their values, so don't load the resource data needed to calculate the
output values (which can be very slow).

Also, explicitly pass resolve_value=False instead of relying on the default
argument (which is different for format_stack_output() and
format_stack_outputs()), to reduce future confusion.

Change-Id: I79aae94b6552d465db6707cd4a40cd53ff18455b
Closes-Bug: #1719340
2017-09-25 12:49:45 -04:00
Zane Bitter
49d833f9ac Speed up show-stack with outputs in legacy path
When we show a stack including the outputs, we calculate all of the
resource attributes that are referenced anywhere in the stack. In
convergence, these are either already cached (and therefore fast) or need
to be cached (and therefore the initial slowness will pay off in future).
This isn't the case in the legacy path though, since we are not doing
caching of attributes in the database in that path. So this is
unnecessarily calculating all of the referenced attribute values, which are
potentially very slow to get.

For legacy stacks, only calculate the attribute values needed to show the
outputs.

Change-Id: I35800c7f87b58daf05cbabd05bcbcd75d0c0fadb
Partial-Bug: #1719333
2017-09-25 10:53:38 -04:00
Jenkins
4ff8bd7882 Merge "Improve update_wait_condition_handle docstring" 2017-09-25 09:23:30 +00:00
ricolin
05ea6dfa54 Replace SCREEN_LOGDIR with LOGDIR
SCREEN_LOGDIR already been deprecated. This patch move to use
LOGDIR instead.

Change-Id: Ie2323412708efd523d934690b5516d635b008fb2
2017-09-25 16:04:02 +08:00
Jenkins
28eb29ae60 Merge "Remove the existing snapshots from the backend" 2017-09-25 07:10:24 +00:00
ricolin
5213763018 Add attributes schema for OS::Keystone::Project
Add `attributes_schema` and `_resolve_attribute` for
OS::Keystone::Project. This patch allow get_attr works
with OS::Keystone::Project resource.
Partial-Bug: #1648004

Change-Id: Ia561aa44e6939a0488207d60af8d7efdbca05f36
2017-09-25 10:18:26 +08:00
huangtianhua
a8af89ec97 Make sure we can get watch server url in uwsgi mode
We get the 'watch' server url by translating the
'cfn' server url if the 'watch' server url is not
configurated, but in uwsgi mode, the code logic is
incorrect, this patch changes the logic to make sure
that we can get the watch server url in both modes.

Change-Id: Iebf2480f97c11474412d74726eba9cf5c8ed2193
Closes-Bug: #1716815
2017-09-25 10:11:41 +08:00
Jenkins
e39e15a5df Merge "Add default configuration files to data_files" 2017-09-23 03:14:15 +00:00
Jenkins
1dab9a22b3 Merge "Update URL in README.rst" 2017-09-23 02:37:14 +00:00
Thomas Herve
4f4932c790 Defer exceptions in calculating node_data()
When generating the node_data() for a resource, catch and store any
exceptions (other than InvalidTemplateAttribute) encountered while
getting attributes. Re-raise the exception at the point where we try to
read the attribute value, including where we try to serialise the
NodeData object to store in the database.

In convergence, we generate and immediately serialise the NodeData, so
this should result in no substantial change in behaviour there.

In other situations (e.g. when we're just loading the data to show the
stack), this prevents an error in attribute calculation from aborting
the whole operation. The exception will still be raised if (and only if)
the erroneous attribute is accessed, but may be handled more
appropriately. For example, errors in calculating output values are
handled by reporting an error only for that particular output.

Change-Id: Idc97aee87405cc13e83be3373078b52e725850ea
Co-Authored-By: Zane Bitter <zbitter@redhat.com>
Closes-Bug: #1712280
2017-09-22 12:19:13 -04:00
OpenStack Proposal Bot
b27392f221 Updated from global requirements
Change-Id: I5104389fbdfe6bb4c4527f35793a0f17db72b255
2017-09-22 12:50:52 +00:00
Zane Bitter
63f6a71071 Fix unit tests with oslo_messaging 5.32.0
The 5.32.0 release of oslo_messaging included the following change to the
Fake driver:

https://git.openstack.org/cgit/openstack/oslo.messaging/commit/?id=d1dac1c11d357aa8391de7e62f4d003eb820948d

Which means that FakeExchanges are now shared between all
FakeExchangeManager instances. This broke the unit tests in Heat.

This patch effectively reverts the change in oslo_messaging by isolating
FakeExchanges to individual FakeExchangeManger instances once more.

Change-Id: I6c53f477b17247958be7bd6056136bc9f7f50865
Closes-Bug: #1718780
2017-09-21 17:01:01 -04:00
Jesse Pretorius
e5e352f25d Add default configuration files to data_files
In order to make it simpler to use the default
configuration files when deploying services
from source, the files are added to pbr's
data_files section so that the files are
included in the built wheels and therefore
deployed with the code. Packaging and deployment
tools can then more easily use the default files
if they wish to.

This pattern is already established with similar
files for neutron, designate and glance as has
been mentioned in the related bug report.

Change-Id: I1f3c9b2e27d44f28f0e649e2c96a1c3dc1da9ea6
Closes-Bug: #1718356
2017-09-21 15:19:25 +01:00
Zane Bitter
a322a299c6 Refactor FloatingIP add_dependencies() method
This method is approaching the complexity limits in the pep8 gate, so
refactor it to allow us to continue making changes.

Change-Id: Ifdb500df121e60431023c43ff0633b790c4052fe
2017-09-19 11:29:53 -04:00
wbluo0907
127aaef196 Update incorrect timezone description
Change-Id: I6bb45335478b40d2548597979d4754bcd3bfe4fe
2017-09-19 13:46:32 +08:00
Jenkins
e58d1f84f6 Merge "Fix client plugin name when calling ignore_not_found" 2017-09-18 07:24:47 +00:00
OpenStack Proposal Bot
eba0b5e4e5 Updated from global requirements
Change-Id: I242ed5dc0d6b3ed3ec9b2fe25de3c2020fbf60b8
2017-09-16 23:12:02 +00:00