13759 Commits

Author SHA1 Message Date
rabi
fe74658ff0 Improve StackValidationFailed exception
We use StackValidationFailed in many different scenarios and
the the message is at times extremely unhelpful, specifically
when the validation error is deep in a nested stack.

Change-Id: I0183bdf81442e62325a427b4eec5c4cd9b7cb91f
Closes-Bug: #1686360
2017-06-29 09:40:54 +05:30
Jenkins
30c87bae3d Merge "Add releasenotes for Magnum resource replacement" 2017-06-28 04:07:37 +00:00
Jenkins
9bc8019479 Merge "Migrate BayModel to ClusterTemplate" 2017-06-28 04:06:56 +00:00
Jenkins
bc97d4d8e0 Merge "Add Container to Zun resources" 2017-06-27 16:59:09 +00:00
Jenkins
ad20fe3ecb Merge "Mark Server os_collect_config attribute as CACHE_NONE" 2017-06-27 16:51:35 +00:00
Jenkins
265665f776 Merge "New resource: Neutron Trunk" 2017-06-27 16:43:26 +00:00
Jenkins
ff8d741dd5 Merge "Fix snapshot delete in convergence" 2017-06-27 09:31:24 +00:00
Jenkins
27a60a6931 Merge "Store resource attributes in the DB" 2017-06-27 09:28:07 +00:00
Norbert Illes
1f8515ace2 New resource: Neutron Trunk
Add a new OS::Neutron::Trunk resource and support the creation,
deletion and update of Neutron Trunks.

Co-Authored-By: Bence Romsics <bence.romsics@ericsson.com>
Co-Authored-By: David Toth <david.t.toth@ericsson.com>
Change-Id: Iea12844f77abf8c254f6224d55470663eba66aab
Implements: blueprint support-trunk-port
2017-06-27 09:41:21 +02:00
Jenkins
a201c4b7c5 Merge "Updated from global requirements" 2017-06-27 06:23:24 +00:00
Jenkins
1d259554f1 Merge "Revert "Support attributes with dynamic scheme"" 2017-06-27 05:57:49 +00:00
OpenStack Proposal Bot
ec8112852f Updated from global requirements
Change-Id: Ia93b14481f86635270c05942985c53060c841700
2017-06-27 02:33:07 +00:00
Zane Bitter
dc957bc2a6 Revert "Support attributes with dynamic scheme"
This code was never used for anything, as the rest of the patch series
never landed and was abandoned.

This reverts commit 15e52ff5e96f1521d7c06a8d55f62f5fb6ce33d3.

Change-Id: I7d1a22753e8de1d3adf127c14516ebd667513bfa
2017-06-26 14:39:11 -04:00
ricolin
14903dc1cd Mark combination alarm as None resource
Combination alarm has been removed from Aodh since Pike.
We inherit combination alarm from none resource in this patch.
Will schedule to remove the resource in future cycle.
Closes-Bug: #1668342

Change-Id: I573f4bde9b4b7b12879c39111cf87c751f71ad7e
2017-06-26 18:38:11 +08:00
ricolin
8ddd903b03 Add is_placeholder resource data for placeholder resource
This patch add `is_placeholder` key in resource data for placeholder
resource like none resource. And prevent any delete action if key
founded in resource data. We put `is_placeholder` key for none resource
to let it replace existence resource type and still allow exists
resources of that type (which should not contain is_placeholder key in
resource data) will be able to delete those resources.
Partial-Bug: #1668342

Change-Id: I379cd732639a58b92986a5c22d7555b719bdcb39
2017-06-26 18:38:11 +08:00
Thomas Herve
df1708b1a8 Fix snapshot delete in convergence
The patch at I1cb321a3878a0abce9b41832f76bf77c25bf7cb4 properly deleted
the snapshots from the database, but as delete in convergence sets the
template to an empty template, stack.resources is empty. This works
around the problem by deleting the snapshots beforehand.

Related-Bug: #1508299
Change-Id: Id1c2c1a293fdcda07c527f29fedc00b716b303bc
2017-06-26 09:34:15 +02:00
rabi
608b35eaef Disable nova quota check in gate jobs
Seems like Ice4aceac5dc44954db3661480b9365f54e47a4c9
broken the gate. We probably are better off disabling
the quota check altogether.

Change-Id: I55756ac80344fcf9ea78fdf3bd99467f169eb231
2017-06-26 11:29:08 +05:30
Jenkins
173f03a4aa Merge "Don't provide defaults for properties depending on extensions" 2017-06-23 10:26:41 +00:00
Jenkins
4620a5f361 Merge "Add releasenotes for 'contains' function supporting" 2017-06-23 02:25:43 +00:00
AleptNamrata
f5dc433d3f Add Container to Zun resources
This adds OS::Zun::Container to the Zun resources

Co-Authored-By: Hongbin Lu <hongbin.lu@huawei.com>
Implements: blueprint heat-plugin-zun
Change-Id: I979d9593fb25bd2c7df99411a6a5bbe402799f61
2017-06-22 20:49:01 +00:00
Jenkins
9960e7f509 Merge "Never cache Senlin cluster outputs" 2017-06-22 19:20:54 +00:00
Jenkins
eac564aa1b Merge "Pretty print parameters in stack-show" 2017-06-22 14:53:45 +00:00
Jenkins
ed9ee56045 Merge "Never cache the 'show' attribute" 2017-06-22 14:18:32 +00:00
huangtianhua
0d0918dc70 Add releasenotes for 'contains' function supporting
Change-Id: I2870e146dccb5890c971399397c7fddfa69d002e
Blueprint: support-contains-function
2017-06-22 11:51:52 +00:00
Jenkins
c63d3cdd3b Merge "Add 'contains' function" 2017-06-22 11:43:39 +00:00
Jenkins
dbf32307f5 Merge "Don't store rsrc_data before zaqar queue created" 2017-06-22 10:32:46 +00:00
Jenkins
707b11c0f8 Merge "Catch type errors when casting to int" 2017-06-22 08:51:47 +00:00
Jenkins
0f9e9feda9 Merge "Use signal_url in TestAodhAlarm scenario test" 2017-06-22 08:47:03 +00:00
Jenkins
cbc0572038 Merge "Ignore string default for software config input" 2017-06-22 08:46:56 +00:00
Jason Dunsmore
4940fc1a2a Pretty print parameters in stack-show
Previously, we were not using the specialized parameter class' __str__
method to print the parameters in the stack-show output with python
2.x.

Closes-Bug: #1613415
Change-Id: I44295ae567cef91eb484201099c7646cdb16fe08
2017-06-22 07:54:54 +00:00
huangtianhua
f47d898932 Don't store rsrc_data before zaqar queue created
Store rsrc_data 'metadata_queue_id' after zaqar queue
created, to avoid unnecessary queue delete calling when
delete nova server.

Change-Id: Ib1f7759ea66794ebd57fcfcea6b9e596b0e2c1c3
Closes-Bug: #1697682
2017-06-22 07:26:41 +00:00
huangtianhua
f4c4ec63ab Add 'contains' function
Add new function 'contains' to check whether
the specific value is in a sequence. The resolve
result of the new function is a boolean value, so
we put it as a condition function too.

Change-Id: I90074070dd917df13345fb7c8d4ed09e4a76e864
Blueprint: support-contains-function
2017-06-22 07:26:19 +00:00
rabi
1c8c7a7914 Fix py35 tempest issue
Change-Id: Id89f8d085a81abe4a28affb57994aad29304f23c
2017-06-22 09:11:41 +05:30
Zane Bitter
176c3f7d14 Mark Server os_collect_config attribute as CACHE_NONE
When the os_collect_config attribute was added to OS::Nova::Server (in
64ddd071604bf4fbdeb97f8c8fa4e313dd611c3c), it was implemented both in
_resolve_attribute() and in get_attribute(), with the latter overriding the
former so it is never called (for this attribute) and so that the value is
never cached. To be sure, to be sure, the attribute caches - which cannot
contain the value of this attribute - were cleared whenever the deployment
data is updated.

It's much easier to just mark the attribute as CACHE_NONE. This also makes
the status of this attribute visible to other parts of the code.

Change-Id: Icaecf70529f19fb32b34de9cedb82e5006282002
Partial-Bug: #1660831
Partially-Implements: blueprint split-stack-default
2017-06-21 20:18:46 -04:00
Crag Wolfe
0550659f5f Store resource attributes in the DB
Store resource attributes that may be cached in the DB, saving the
cost of re-resolving them later. This works for most resources,
specifically those that do not override the get_attribute() method.

Change-Id: I71f8aa431a60457326167b8c82adc03ca750eda6
Partial-Bug: #1660831
2017-06-21 20:18:46 -04:00
Zane Bitter
0c9adf8e48 Never cache Senlin cluster outputs
Since the node list and attribute outputs from a Senlin cluster may change
without Heat knowing about it, always retrieve this data live from the
Senlin API.

Change-Id: Ida1dc710984ce938a72a52c848c2305bc8df5383
2017-06-21 20:18:46 -04:00
Zane Bitter
f47efe532d Never cache the 'show' attribute
The 'show' attribute is used to get all data about a resource. There are
folks using this in lieu of having access to the underlying OpenStack APIs
themselves. By not caching it, we ensure that they will always see a live
value, even once we start storing attribute values in the database when
modifying a resource.

Change-Id: Id81a56f7d774bc18a2b5d62c80b369f1c12bcc5c
Co-Authored-By: Crag Wolfe <cwolfe@redhat.com>
Related-Bug: #1660831
2017-06-21 20:04:01 -04:00
Thomas Herve
f911ebbd67 Ignore string default for software config input
We recently (I87edc0d8f1fba2fb61276c682a60c1b2241b5705) enforced default
type for software config input, whereas it was always a string before.
It causes issues with upgrades, as we used to store "" as a default for
all configs regarless of their type, and it failed when we started
validating.

This identifies this case and skip validation.

Change-Id: I8a4f4e834b0862ecef4b97f208f4b03be3572e86
Closes-Bug: #1697627
2017-06-20 16:21:11 +02:00
Jenkins
a5ac2c3b1d Merge "Document user_data replace-on-update policy" 2017-06-20 11:39:20 +00:00
OpenStack Proposal Bot
4f4e1fcfef Updated from global requirements
Change-Id: Idd9d3bf02441011440667b822139d6a64ac6c31b
2017-06-19 21:02:37 +00:00
Jenkins
7661a93c79 Merge "Use correct user password as occ credential" 2017-06-19 10:52:12 +00:00
huangtianhua
e23fcfe93a 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
2017-06-19 08:04:18 +00:00
OpenStack Proposal Bot
eed524e771 Updated from global requirements
Change-Id: Id5df151fdb3d580c285356bf2be6bc10d65df42e
2017-06-19 05:37:18 +00:00
Jenkins
7698eb0501 Merge "Load all templates for generating parameter schema" 2017-06-19 04:57:30 +00:00
Thomas Herve
98c89e0f4b Catch type errors when casting to int
Casting a parameter to a number can fail with a type error as well as a
value error. Let's catch it to get a proper validation error.

Change-Id: I63779a6227b834cedeeed1c4d5d49271e15e4ea9
Closes-Bug: #1698365
2017-06-16 14:39:56 +02:00
Zane Bitter
3ffe67eaf4 Document user_data replace-on-update policy
Since d4188127a14686f6d9844180b977cf5fa05aa024 the documentation for the
user_data property of OS::Nova::Server has been dangerously misleading,
stating that updates to the property don't cause replacement of the
resource, which is not true by default. This adds documentation that
explains exactly what is going on.

Change-Id: I2d95205fbcbd0bfafa6690a6efec1a56441ce22d
2017-06-15 12:18:54 -04:00
Zane Bitter
41b8e44d1e Fix races in SoftwareDeploymentGroupTest
Don't assume that we can get the physical IDs of all of the
SoftwareDeployment resources as soon as the stack becomes
CREATE_IN_PROGRESS. 4dd67bb1aa2df4f5270f79600ac1f888b0bd9a5f reads them
again once the stack is COMPLETE; this patch also uses the same physical
resource IDs to verify the update.

Also, make sure all of the resources are IN_PROGRESS before trying to
signal them, because the signal_resources() utility method only signals
resources that are IN_PROGRESS.

Change-Id: I9787a5de5e4272a3ab370f653182aa9283ae01c0
Closes-Bug: #1697794
Closes-Bug: #1626073
Closes-Bug: #1625921
2017-06-14 16:31:54 -04:00
Jenkins
724d60949e Merge "Fix nova floatingip resources" 2017-06-14 14:52:02 +00:00
Jenkins
9e410ec4dd Merge "Get the deployment group resources again after CREATE_COMPLETE" 2017-06-14 00:54:02 +00:00
Jenkins
0e67fb4c6e Merge "Don't always validate property values in ResourceChain" 2017-06-13 20:41:04 +00:00