10012 Commits

Author SHA1 Message Date
Thomas Herve
06f2fd72cd Fix grenade shutdown script
Due to some fix in devstack, using the old lib/heat library doesn't work
anymore, so let's replicate the stop_heat function.

Change-Id: I8e7c62962cef29e35c37ad98a1646630388fb4ab
Closes-Bug: #1506462
2015-10-15 14:38:13 +02:00
Jenkins
6b8e83ceb1 Merge "Replaced mox with mock in test_watch" 2015-10-15 04:17:54 +00:00
Jenkins
41b9ecf3a8 Merge "Update Baymodel in Magnum resources" 2015-10-15 02:55:44 +00:00
Jenkins
b4dd5dbb1a Merge "Remove ceilometer specific config for grenade plugin" 2015-10-14 22:04:01 +00:00
Jenkins
bd92ef2988 Merge "Refactor keystone resources codes" 2015-10-14 19:53:35 +00:00
Jenkins
8b6d082ca7 Merge "Fix parameter_defaults for comma_delimited_list and json" 2015-10-14 18:46:07 +00:00
Jenkins
d387883d5a Merge "StackUser tolerate missing user on delete" 2015-10-14 18:45:57 +00:00
Jay Dobies
0ae9ba1fa9 Replaced mox with mock in test_watch
Change-Id: Ic7d4d152c529b29fa1e07cf865181f623d6744b8
Implements: blueprint mox-to-mock-conversion
2015-10-14 13:49:44 -04:00
Steven Hardy
730ccc5abf StackUser tolerate missing user on delete
If a stack domain user is missing on delete, we currently fail to
delete the keypair.  We should tolerate this in a simiar way to
that done for _delete_user.

Change-Id: I6d60612e6187385a2d3b6b6fcf67acb99b572fc3
Closes-Bug: #1505981
2015-10-14 11:23:00 +01:00
OpenStack Proposal Bot
6ea088b781 Updated from global requirements
Change-Id: I50148ea8e523d01d2109314d5e9e5a79a40a1a32
2015-10-14 09:28:40 +00:00
Jiri Stransky
3827c61b25 Fix parameter_defaults for comma_delimited_list and json
When environment of a stack contained a parameter_defaults section with
a value for a parameter of type comma_delimited_list or json, that default
didn't get applied unless in a nested stack.

The issue was that CommaDelimitedListParam contains a variable to cache
its value, and that cache was only created upon creation of a
CommaDelimitedListParam object, but it wasn't updated on `set_default`
method call. The cache now updates on `set_default` too.

Co-Authored-By: Steven Hardy <shardy@redhat.com>
Change-Id: I85b13a79dbc97a77e20c0d5df8eaf05b3000815e
Closes-Bug: #1504137
2015-10-14 10:52:20 +02:00
Sirushti Murugesan
667fd80d47 Remove ceilometer specific config for grenade plugin
Ceilometer services are now enabled and controlled via a plugin
with this change Ie3219a41a3d371d9ac21552e3d8b15775ea696f6. This
means we can remove all ceilometer specific manual config entries
in the grenade plugin.

Related-Bug: #1489436

Change-Id: I2fbff1fed38ac8acc8a7950024714abea049aeb8
2015-10-14 12:28:35 +05:30
Jenkins
dda94d7681 Merge "Grenade: Run select heat_integrationtests instead of tempest smoke" 2015-10-14 06:19:02 +00:00
Jenkins
76320cab23 Merge "Announce Python 3.4 support" 2015-10-14 06:18:52 +00:00
Jenkins
3cfb9038d2 Merge "Support update for sahara node group template" 2015-10-14 06:18:40 +00:00
Jenkins
92e7bbde47 Merge "Add signal_transport property to Heat wait conditions" 2015-10-14 04:39:50 +00:00
Jenkins
02c3112d21 Merge "Remove unneeded is_service_available" 2015-10-14 02:33:26 +00:00
Jenkins
cead4b8cdf Merge "Add port_extra_properties to Nova::Server nics" 2015-10-14 01:20:01 +00:00
Robert Pothier
11dabdb38a Update Baymodel in Magnum resources
This updates OS::Magnum::BayModel in the Magnum resources
with the new properties network_driver, http_proxy,
https_proxy, no_proxy, labels, and insecure.

Change-Id: I2c9ce5a7b3203feee0ba444440f8a3e3a1c9cd0d
Implements: partial blueprint magnum-resources
2015-10-13 16:44:03 -04:00
Miguel Grinberg
939f0fddce Add signal_transport property to Heat wait conditions
This change enhances Heat wait condition resources with selectable
signal types. The token based signal is kept for compatibility, but now
the user can opt for any of the other signal types supported by the
SignalResponder class.

Change-Id: Iafc28954b743f0dc46a49d29d42e7123827930b8
Implements: blueprint uniform-resource-signals
2015-10-13 12:27:05 -07:00
Tetiana Lashchova
b2bf738149 Support update for sahara node group template
Change-Id: Iea6532d04964daa65c1f830abf065476c32603ca
2015-10-13 17:41:09 +03:00
Jenkins
3a827fed7d Merge "Use generated auth_token instead of that in context" 2015-10-13 13:58:53 +00:00
Jenkins
aa6449ce5d Merge "Encode Location header in utf-8" 2015-10-13 13:05:39 +00:00
Jenkins
6a169f0026 Merge "Replaced mox with mock in test_loguserdata" 2015-10-13 11:18:37 +00:00
Jenkins
7e27005def Merge "Optimize test_server unit tests" 2015-10-13 10:56:13 +00:00
Oleksii Chuprykov
a1b3c23ff8 Encode Location header in utf-8
We get Location header in unicode format. Need to encode it to utf-8
format, otherwise heat won't work on some requests running via
mod_wsgi.

Closes-Bug: #1500807
Change-Id: I8950360e71cd62baf899d0aff822b981b5d99068
2015-10-13 12:49:33 +03:00
Oleksii Chuprykov
99916ecae6 Use generated auth_token instead of that in context
We have additional logic in auth_token property in client_plugin.
Lets use it.

Change-Id: If563e2572d8835862b0c73c1e6dbc92eab479abd
2015-10-13 12:42:47 +03:00
Oleksii Chuprykov
14c9f1b4d5 Remove unneeded is_service_available
Don't need this anymore because mistral is a part of heat requirements.

Change-Id: I42935ac51246798233129b6c7caee5ec7ef9000b
2015-10-13 12:27:08 +03:00
Jenkins
a8b15085d7 Merge "Add stack tags to stack abandon output" 2015-10-13 08:01:51 +00:00
Jenkins
5ee6f6dc40 Merge "Assign updated stack ID during stack update preview" 2015-10-13 07:38:46 +00:00
Jenkins
1d9ee1db66 Merge "Updated from global requirements" 2015-10-13 07:38:05 +00:00
Jenkins
5922283e2c Merge "Convergence: Fix restore on rollback for server and port" 2015-10-13 07:18:34 +00:00
OpenStack Proposal Bot
4e40b11d2d Updated from global requirements
Change-Id: I92035376359dd94908ef40f8b781357abcb98a42
2015-10-13 05:25:28 +00:00
Jenkins
709f53bd10 Merge "Do not return None when get_attr if res is in SNAPSHOT/CHECK" 2015-10-13 03:59:32 +00:00
huangtianhua
49417fa15a Refactor keystone resources codes
The refactor includes:
1. Remove some redundant codes
2. Use self.properties[*] instead of self.properties.get(*)

Change-Id: Ic7a3001ab271cad12f4fe45c0930562070a0d600
2015-10-13 10:47:16 +08:00
Jason Dunsmore
72ac4def9f Assign updated stack ID during stack update preview
Change-Id: Ibb85263023bb6e7d2420ac219306b344e584461e
Closes-Bug: #1504319
2015-10-12 13:03:22 -05:00
Jason Dunsmore
3c128ba20c Add stack tags to stack abandon output
Change-Id: Iafa7dcd2f1751edc413707091b80d10fd442e213
Closes-Bug: #1504589
2015-10-12 12:24:20 -05:00
Jenkins
8aa49f702a Merge "Add testresources used by oslo.db fixture" 2015-10-12 15:51:00 +00:00
Jay Dobies
9ff5437e72 Replaced mox with mock in test_loguserdata
Also fixed a bug in loguserdata for an incorrect tuple instantiation

Change-Id: Ic7bcf018b771505e3ef6c747e0624f929463eb5b
2015-10-12 10:15:19 -04:00
Rakesh H S
22a8ca5360 Optimize test_server unit tests
Change-Id: I0894cd31aa8b76a63c96a7bc4edcf2abcf1ccf48
2015-10-12 19:22:34 +05:30
Rakesh H S
ddf84f8ea6 Convergence: Fix restore on rollback for server and port
Implements the special handling required for server and port resources
rollback to be possible.

Change-Id: If1b39df070f5e5394304d3e2b31ee7226ec2f270
Partial-Implements: blueprint rich-network-prop
Closes-Bug: #1498660
2015-10-12 17:46:25 +05:30
Peter Razumovsky
1a972838ba Remove [H405] and [H404] ignoring in tox.ini
Remove H405 and H404 rule from ignored rules in
tox.ini.

Also, fix some new [H405]/[H404] errors.

Change-Id: I71065e2c3c300aa69ce204ee78672b08ca413651
2015-10-12 14:08:16 +03:00
Peter Razumovsky
c4b0ced813 Fix [H405] pep rule in heat/tests
Implements bp docstring-improvements

Change-Id: I2fd82d698f42aca3b34822875cf4d706fedbf5f2
2015-10-12 14:08:16 +03:00
Jenkins
34f32eef0e Merge "Fix [H405] pep rule in heat_integrationtests" 2015-10-12 10:42:47 +00:00
Jenkins
0e3399c331 Merge "Fix [H405] pep rule in heat/resources" 2015-10-12 10:42:29 +00:00
Peter Razumovsky
b23ee3a94b Add port_extra_properties to Nova::Server nics
Add port_extra_properties to Nova::Server networks
list for detailed definition of internal port due
creating.

implements bp rich-network-prop

Change-Id: Ifddcc46711a48ec762bba76fc11562d14e00e312
2015-10-12 13:22:26 +03:00
Sergey Kraynev
a7368fb68e Add testresources used by oslo.db fixture
If we use oslo.db fixtures, we'll need these 2 packages or
the next version of oslo.db release will break us.

Change-Id: I71f001c8b75ad52e68ccab8f07cd8946772fd03b
Closes-Bug: #1503501
2015-10-12 09:38:28 +00:00
Jenkins
9dfc1ac5a1 Merge "Assert has_calls in tests" 2015-10-12 09:22:28 +00:00
huangtianhua
20825d991e Do not return None when get_attr if res is in SNAPSHOT/CHECK
To get attribute instead of return None if resource
is in SNAPSHOT or CHECK action.

This patch allow to get_attr for hot template version
'2013-05-23' also.

Change-Id: I318f4c158ebe0a4afbb3f0bcbe9d856d90f0a4bb
Closes-Bug: #1505054
2015-10-12 15:42:17 +08:00
Jenkins
35ed968a21 Merge "Add _needs_update() to AWS::EC2::EIPAssociation" 2015-10-12 06:13:54 +00:00