6199 Commits

Author SHA1 Message Date
Angus Salkeld
3f73f82a0d Don't pass empty action strings to ceilometer
Note: this only really happens when using the cloud watch
resource template.

Partial-bug: #1373247
Change-Id: I084d28dfbbd0f2d7a6a18a09600f86880fa394d5
2014-09-25 19:42:28 +10:00
Angus Salkeld
b0903a5598 Make sure that AutoScaling group has it's tag set correctly
At the moment we have to rely on the base classes metering.groupname
and this AutoScalingGroupName is effectively lost.

Change-Id: I6f4c099bde83fba5ad89e43297503943136b717e
Partial-bug: #1373247
2014-09-25 19:42:28 +10:00
Jenkins
a7d10dc43b Merge "Convert parse error to text type" 2014-09-25 09:27:22 +00:00
Jenkins
b8ed38807e Merge "Use six to translate exception message in tests" 2014-09-25 04:56:35 +00:00
Steve Baker
58a094238b Convert parse error to text type
Some local environments (but not yet the gate) are experiencing
failure of InstantiationDataTest.test_format_parse_invalid_message.

This change fixes that test by converting the parse exception to
a text type before including it in the error message.

Change-Id: I06e271559e27452a7a0c1e8807a37bb5ed5df2fa
Closes-Bug: #1365880
2014-09-24 10:43:44 +12:00
Jenkins
dc0ba2ac54 Merge "Fix outdated comment in KeystoneClientV3." 2014-09-23 22:39:30 +00:00
Ethan Lynn
fcba3fa9c8 Use six to translate exception message in tests
Use six to translate exception message in tests

Change-Id: I129de2f350ef31c6a8ef10355ada20d7789049a9
2014-09-22 10:47:15 +08:00
OpenStack Proposal Bot
689ea2742e Updated from global requirements
Change-Id: I2d0250cbb41d79d0210964f7f99c1c6eeeef1257
2014-09-19 09:16:52 +00:00
Jenkins
68f78c8edb Merge "Updated from global requirements" 2014-09-19 06:58:32 +00:00
Jenkins
442e79b559 Merge "Switch heat resources & db & tests to oslo.i18n" 2014-09-19 04:23:49 +00:00
Jenkins
047a92428a Merge "Save files while updating a template." 2014-09-18 22:58:04 +00:00
OpenStack Proposal Bot
e138570153 Updated from global requirements
Change-Id: Iafa34405877d0b8c7e91275a3edee87523c5fc16
2014-09-18 22:56:06 +00:00
Jenkins
9cfe20b3da Merge "Switch heat engine to oslo.i18n" 2014-09-18 07:26:30 +00:00
Jenkins
736484b238 Merge "Add user data and config drive properties" 2014-09-18 07:26:18 +00:00
Jenkins
c620894075 Merge "Implement CFN CancelUpdateStack action" 2014-09-18 05:56:02 +00:00
Jenkins
1fdce41373 Merge "Set the default state of a stack to CREATE_IN_PROGRESS" 2014-09-17 15:16:25 +00:00
Pavlo Shchelokovskyy
c8dfe2c100 Implement CFN CancelUpdateStack action
Change-Id: I7a4d9de34448f6f3ad964e36347a80a2f2140251
Implements: blueprint cancel-update-stack
2014-09-17 11:57:49 +03:00
Jenkins
cd3e910312 Merge "Pass list of parameters to engine service to reset" 2014-09-17 07:32:04 +00:00
Ethan Lynn
6d0cd62172 Switch heat resources & db & tests to oslo.i18n
Use oslo.i18n in resources & db & tests directories.

blueprint oslo-i18n

Change-Id: Idaf718b9d762b9ae89d6045557eadb758b552bd5
2014-09-17 14:28:56 +08:00
Jenkins
3b6cd227d6 Merge "Updated from global requirements" 2014-09-17 01:54:30 +00:00
Jenkins
a5dcd8383b Merge "Pass flag to engine service to patch parameters" 2014-09-16 12:19:26 +00:00
Jenkins
3e5e01d201 Merge "Correct KEY/VALUE names for NOVA_SCHEDULER_HINTS" 2014-09-16 12:08:35 +00:00
Jenkins
6672847ca9 Merge "Don't delete stack domain project on stack-abandon" 2014-09-16 07:14:07 +00:00
Jenkins
c7ae4e88f6 Merge "Cleanup trust on delete with stored context if needed" 2014-09-16 06:39:17 +00:00
Jenkins
f67e8d056e Merge "Tests update FakeKeystoneClient to align user_id and trustor" 2014-09-16 06:30:51 +00:00
Ethan Lynn
c2211f0e0a Switch heat engine to oslo.i18n
Remove gettextutils from heat engine and import oslo.i18n.

blueprint oslo-i18n

Change-Id: Iadf4cfc0f9a0b94c1f2fa1eb71f807539247b34e
2014-09-16 14:08:53 +08:00
Ton Ngo
b8ba69e05f Pass list of parameters to engine service to reset
For stack-update, a new argument named clear-parameters with
a list is passed in from the CLI and the new PATCH ReST API
to delete the indicated parameters from the existing parameters
in the DB, allowing the default parameters in the template to
be used.  A new method in environment handles the reset.

Partially-implements: blueprint troubleshooting-low-level-control
Partial-Bug: 1224828
Change-Id: Ia1270b679f27e264e6977c590d676b947c74c5da
2014-09-15 17:51:32 -07:00
Ton Ngo
b98c19fbbf Pass flag to engine service to patch parameters
For stack-update, add a new PATCH ReST API and a new CLI
argument named existing-parameters to indicate that the set
of parameters should be patched over the existing parameter
from the DB.  A new method in environment handles
the patching.

Partially-implements: blueprint troubleshooting-low-level-control
Partial-Bug: 1224828
Change-Id: I802e0dca44926be3a3f45fcaa995c866a4abf998
2014-09-15 17:47:40 -07:00
OpenStack Proposal Bot
a13f486831 Updated from global requirements
Change-Id: I6efe9af9eb42420a7ff4a14adecba54d6fb170b3
2014-09-15 16:58:40 +00:00
tengqm
20f16af571 Fix outdated comment in KeystoneClientV3.
This patch fixes the outdated class comment for KeystoneClientV3.

Change-Id: I7735dd8b2c672cf9e40d01a6a72fd90f1540352a
2014-09-15 23:22:31 +08:00
Jenkins
9b700a1b6e Merge "Convert functions into a fixed part of the template" 2014-09-15 14:54:23 +00:00
Jenkins
6ff1d50675 Merge "Enhance SoftwareComponent property validation" 2014-09-15 13:04:05 +00:00
Jenkins
f49014c5bc Merge "Enable SoftwareDeployment for SoftwareComponent" 2014-09-15 13:03:57 +00:00
Jenkins
697d7854f9 Merge "Add OS::Heat::SoftwareComponent resource" 2014-09-15 13:03:48 +00:00
huangtianhua
16cae01437 Correct KEY/VALUE names for NOVA_SCHEDULER_HINTS
Correct KEY/VALUE names when parsing the NOVA_SCHEDULER_HINTS
property.

Change-Id: Ic4ee2393572d710fe699fdba4e8dff84bd33d959
2014-09-15 12:13:30 +08:00
Jenkins
084058ae9e Merge "Add Heat REST API action for cancel update stack" 2014-09-15 01:51:59 +00:00
Jenkins
00d101c1c5 Merge "Add RPC API for cancel update stack" 2014-09-15 01:51:51 +00:00
Jenkins
ab7f642844 Merge "Replace marconi by zaqar in heat plugins" 2014-09-14 03:31:28 +00:00
Jenkins
d905dbcfaf Merge "Allow filtering of stacks by username, tenant and owner_id" 2014-09-13 17:14:03 +00:00
Jenkins
69d484a994 Merge "Clarify NotFound error when creating trust" 2014-09-13 17:13:45 +00:00
Jenkins
11af46f939 Merge "Fix file mode, remove executable bit." 2014-09-13 17:12:29 +00:00
Jenkins
f07c51dc52 Merge "Fix AWS::EC2::VPC resource delete failure" 2014-09-13 17:09:24 +00:00
Jenkins
198c4eeea9 Merge "Fix signal handling for WSGI servers" 2014-09-13 16:57:28 +00:00
Jenkins
7ded8f3b50 Merge "Manually update requirements to oslo.messaging" 2014-09-13 15:43:54 +00:00
Pavlo Shchelokovskyy
f94c175df0 Add Heat REST API action for cancel update stack
Implements blueprint cancel-update-stack (partial)

Change-Id: I5bc5ceebc6c0962540b7fc5f3f7fd3703431a8e7
2014-09-13 16:56:53 +03:00
Pavlo Shchelokovskyy
a75f055caf Add RPC API for cancel update stack
Implements cancelling of stack update in progress, for any stack
regardless of disable_rollback status.

As a side-effect, a framework for sending arbitrary one-time signals from
outside into a task running as greenthread is added. ThreadgroupManager
holds references of greenlet events associated with a given stack now.

Implements blueprint cancel-update-stack (partial)

Change-Id: Ic929d42946cf28eeb2a7caea8bf908f492693c09
2014-09-13 16:53:04 +03:00
Jenkins
38aa12a015 Merge "Make str(json_param) return string vs python" 2014-09-13 03:35:14 +00:00
Jenkins
0485d4d4c2 Merge "Only delete stack user project from correct domain" 2014-09-13 03:15:58 +00:00
Jenkins
000ecbf0c8 Merge "Reuse disable_rollback on stack update" 2014-09-13 02:30:47 +00:00
Jenkins
4f6e5e042e Merge "Fix so that CSV as str return value" 2014-09-13 00:54:13 +00:00