]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
11 years agoChange _testnoexisthost_ references in tests
Steven Hardy [Tue, 3 Sep 2013 23:05:42 +0000 (00:05 +0100)]
Change _testnoexisthost_ references in tests

These dummy urls are obviously invalid, but could potentially trigger
unexpected failures due to the underscores.

Instead use RFC2606's recommended test TLD of '.test' ensures
that these will never resolve.

Change-Id: I2723b18ef3eba81ee8c8a22d866ceb79c00aad75

11 years agoMigrate stored credentials to keystone trusts
Steven Hardy [Mon, 2 Sep 2013 15:32:40 +0000 (16:32 +0100)]
Migrate stored credentials to keystone trusts

Migrate the stored user_creds, which currently only supports
storing username/password credentials to use the keystone v3
API OS-TRUST extension, which allows explicit impersonation of
users calling heat (trustors) by the heat service user (the
trustee)

Note this feature is made optional via a new config option,
defaulted to off, and it requires the following patches to
keystoneclient (in 0.3.2 release) and keystone to work:

https://review.openstack.org/#/c/39899/
https://review.openstack.org/#/c/42456/

Also note that if the feature is enabled, by setting
deferred_auth_method=trusts in heat.conf, you must add
a keystone_authtoken section, which is also used by the
keystoneclient auth_token middleware.

blueprint heat-trusts

Change-Id: I288114d827481bc0a24eba4556400d98b1a44c09

11 years agoMerge "Parallelise Server updates"
Jenkins [Tue, 3 Sep 2013 18:28:25 +0000 (18:28 +0000)]
Merge "Parallelise Server updates"

11 years agoMerge "Add trust_id and trustor_user_id Context and DB"
Jenkins [Tue, 3 Sep 2013 13:54:43 +0000 (13:54 +0000)]
Merge "Add trust_id and trustor_user_id Context and DB"

11 years agoAdd trust_id and trustor_user_id Context and DB
Steven Hardy [Mon, 2 Sep 2013 15:29:39 +0000 (16:29 +0100)]
Add trust_id and trustor_user_id Context and DB

Add trust_id and trustor_user_id to the user_creds table
and related RequestContext object

blueprint heat-trusts

Change-Id: Ie0fdc5068475db7e84f366d1eb2b9ae56db0b3fc

11 years agoDon't use a query for stack_get()
Zane Bitter [Mon, 2 Sep 2013 14:00:36 +0000 (16:00 +0200)]
Don't use a query for stack_get()

When getting a database record by ID, it is much more efficient to get() it
directly than to perform a query or the database to obtain the ID (again)
and then get it.

Since stack_get() returns only a single record that can be trivially
checked for deletion in code, do this rather than performing a query with a
filter.

Change-Id: I4bb3ea1a9c4ae928fe0f5bce5c02b842a3f1ab4f

11 years agoMerge "Delete the old example config files"
Jenkins [Mon, 2 Sep 2013 13:31:55 +0000 (13:31 +0000)]
Merge "Delete the old example config files"

11 years agoMerge "Remove references to the multiple config files"
Jenkins [Mon, 2 Sep 2013 13:02:58 +0000 (13:02 +0000)]
Merge "Remove references to the multiple config files"

11 years agoMerge "Rackspace: Parallelise CloudServer updates"
Jenkins [Mon, 2 Sep 2013 12:02:28 +0000 (12:02 +0000)]
Merge "Rackspace: Parallelise CloudServer updates"

11 years agoMerge "EC2token middleware implement multi-cloud auth"
Jenkins [Mon, 2 Sep 2013 12:00:47 +0000 (12:00 +0000)]
Merge "EC2token middleware implement multi-cloud auth"

11 years agoMerge "Sync rpc from oslo-incubator"
Jenkins [Mon, 2 Sep 2013 12:00:45 +0000 (12:00 +0000)]
Merge "Sync rpc from oslo-incubator"

11 years agoMerge "Parallelise Instance updates"
Jenkins [Mon, 2 Sep 2013 11:02:47 +0000 (11:02 +0000)]
Merge "Parallelise Instance updates"

11 years agoMerge "Allow resources to be updated in parallel"
Jenkins [Mon, 2 Sep 2013 11:02:40 +0000 (11:02 +0000)]
Merge "Allow resources to be updated in parallel"

11 years agoMerge "Don't stub LoadBalancer.update in autoscaling tests"
Jenkins [Mon, 2 Sep 2013 11:00:37 +0000 (11:00 +0000)]
Merge "Don't stub LoadBalancer.update in autoscaling tests"

11 years agoMerge "Do updates based on a single dependency list"
Jenkins [Mon, 2 Sep 2013 11:00:30 +0000 (11:00 +0000)]
Merge "Do updates based on a single dependency list"

11 years agoMerge "Make security groups associated with Neutron port work"
Jenkins [Mon, 2 Sep 2013 10:54:11 +0000 (10:54 +0000)]
Merge "Make security groups associated with Neutron port work"

11 years agoMerge "Support ISO8601 duration format for UpdatePolicy PauseTime"
Jenkins [Mon, 2 Sep 2013 10:45:43 +0000 (10:45 +0000)]
Merge "Support ISO8601 duration format for UpdatePolicy PauseTime"

11 years agoDelete the old example config files
Angus Salkeld [Thu, 29 Aug 2013 01:58:44 +0000 (11:58 +1000)]
Delete the old example config files

heat.conf.sample is the master sample now.

Change-Id: I732bc8a363c3829a68fddfb4c03cf4bca52d8842

11 years agoRemove references to the multiple config files
Angus Salkeld [Thu, 29 Aug 2013 02:05:37 +0000 (12:05 +1000)]
Remove references to the multiple config files

Only refer to heat.conf in the docs and scripts.
For install.sh copy the iniset() function from devstack
to assist in setting some semi-sane defaults.

Change-Id: I933891e35103c003f1272bc89c7b42d2ad76697b

11 years agoSupport ISO8601 duration format for UpdatePolicy PauseTime
Winson Chan [Sun, 1 Sep 2013 20:13:58 +0000 (13:13 -0700)]
Support ISO8601 duration format for UpdatePolicy PauseTime

Adds a timeutils module in heat common to handle ISO 8601
duration format. Separating this as a different patch per
request.

Change-Id: I2fe6fccde838f4ddac6b898e4518ffb33e2a76fc
Implements: blueprint as-update-policy

11 years agoSync rpc from oslo-incubator
Russell Bryant [Fri, 30 Aug 2013 21:57:29 +0000 (17:57 -0400)]
Sync rpc from oslo-incubator

This includes the following changes:

76972e2 Support a new qpid topology
284b13a Raise timeout in fake RPC if no consumers found
9721129 exception: remove
7b0cb37 Don't eat callback exceptions
69abf38 requeue instead of reject

Change-Id: I9113991aebe7d566c8877d74aad9d55b65fdfb9e
Closes-bug: #1178375

11 years agoMake security groups associated with Neutron port work
Jeff Peeler [Fri, 23 Aug 2013 20:44:37 +0000 (16:44 -0400)]
Make security groups associated with Neutron port work

The security group names are now translated to UUIDs which is required
when using the python API. The lookup has been improved to find
existing security groups not part of the stack as well.

Fixes bug #1179481

Change-Id: I4f86bade87f89b867d12822c5f80aa5b075b7fbb

11 years agoParallelise Server updates
Zane Bitter [Fri, 30 Aug 2013 13:27:59 +0000 (15:27 +0200)]
Parallelise Server updates

Change-Id: I6a2e5841a3a65edb99f227d5849800eb696c9faa

11 years agoRackspace: Parallelise CloudServer updates
Zane Bitter [Fri, 30 Aug 2013 13:25:54 +0000 (15:25 +0200)]
Rackspace: Parallelise CloudServer updates

Change-Id: I7c5f42500a3c207f0f2e9149dba092519f65a2a2

11 years agoParallelise Instance updates
Zane Bitter [Fri, 30 Aug 2013 13:16:24 +0000 (15:16 +0200)]
Parallelise Instance updates

Change-Id: I358f7fbdb3232f4bf528d170476935ef2b4239cc

11 years agoAllow resources to be updated in parallel
Zane Bitter [Fri, 30 Aug 2013 18:45:54 +0000 (20:45 +0200)]
Allow resources to be updated in parallel

Turn Resource.update() into a coroutine.

Change-Id: I625a2d81095cc28161f8e2342121bfe1939611e3

11 years agoDon't stub LoadBalancer.update in autoscaling tests
Zane Bitter [Fri, 30 Aug 2013 18:45:54 +0000 (20:45 +0200)]
Don't stub LoadBalancer.update in autoscaling tests

Stub handle_update() instead. We can still verify that the arguments are as
expected, while still exercising as much of the logic as possible.

Change-Id: Iebb861bb5af27d92e65083c8bac6821f91382dd5

11 years agoDo updates based on a single dependency list
Zane Bitter [Fri, 30 Aug 2013 18:50:11 +0000 (20:50 +0200)]
Do updates based on a single dependency list

This ensures that updates proceed in the correct order with maximum
parallelism, for arbitrarily complex dependency graphs.

Change-Id: Ia11f4cfef58a3045199e1e5e49050cb1646f5057

11 years agoautoscaling test fix assertRaises Exception warning
Steven Hardy [Fri, 30 Aug 2013 10:25:33 +0000 (11:25 +0100)]
autoscaling test fix assertRaises Exception warning

Fix "H202 assertRaises Exception too broad" warning

Change-Id: I162dbd8e421b22cbf3a55b7052107c8332b8d59a

11 years agoRemove localhost references from tests
Steven Hardy [Fri, 30 Aug 2013 10:12:24 +0000 (11:12 +0100)]
Remove localhost references from tests

Using localhost in dummy URLs is a bad idea, because if you get
your mocking slightly wrong, some tests try to connect to the
services running in your local test environment.

Change-Id: I5550c397230f94740c63e6cab30ac35b3ae85297

11 years agoMerge "Add schema for security group rule"
Jenkins [Thu, 29 Aug 2013 16:40:36 +0000 (16:40 +0000)]
Merge "Add schema for security group rule"

11 years agoMerge "Fix CFN API error responses"
Jenkins [Thu, 29 Aug 2013 06:53:11 +0000 (06:53 +0000)]
Merge "Fix CFN API error responses"

11 years agoMerge "Implement interruption-free update and rollback"
Jenkins [Thu, 29 Aug 2013 04:18:03 +0000 (04:18 +0000)]
Merge "Implement interruption-free update and rollback"

11 years agoMerge "Cleanup the Properties doc strings"
Jenkins [Thu, 29 Aug 2013 01:46:12 +0000 (01:46 +0000)]
Merge "Cleanup the Properties doc strings"

11 years agoMerge "Add auto code api doc generation"
Jenkins [Thu, 29 Aug 2013 01:45:20 +0000 (01:45 +0000)]
Merge "Add auto code api doc generation"

11 years agoMerge "Generate docs using new properties Schema class"
Jenkins [Thu, 29 Aug 2013 01:45:18 +0000 (01:45 +0000)]
Merge "Generate docs using new properties Schema class"

11 years agoMerge "Implement native nova server resource"
Jenkins [Thu, 29 Aug 2013 01:45:17 +0000 (01:45 +0000)]
Merge "Implement native nova server resource"

11 years agoMerge "Add the missing heat.po files into heat"
Jenkins [Thu, 29 Aug 2013 01:44:58 +0000 (01:44 +0000)]
Merge "Add the missing heat.po files into heat"

11 years agoMerge "Give Property constraints a string representation"
Jenkins [Wed, 28 Aug 2013 23:09:25 +0000 (23:09 +0000)]
Merge "Give Property constraints a string representation"

11 years agoImplement native nova server resource
Steve Baker [Sun, 18 Aug 2013 23:12:59 +0000 (11:12 +1200)]
Implement native nova server resource

Some notes on the implementation:
- extends Resource rather than Instance since most of the
  complexity of Instance is in the handling of the Volumes
  attribute
- exposed properties and attributes map as closely as possible
  to the underlying v1 nova API (rather than the nova client library)
- property or attribute key namespaces have been stripped to provide
  a cleaner API and avoid YAML quoting.
  (eg instance_name -> 'OS-EXT-SRV-ATTR:instance_name')
- an assumption is currently made that any volumes specified
  in block_device_mapping should not be detached on suspend
- Network address properties attempt to cater for simple and
  advanced use-cases:
  - 'first_private_address' and 'first_public_address' for simple
    template attribute scenarios, and to aid with AWS::EC2::Instance
    transition
  - 'networks' for a simple data structure which provides all addresses
  - 'addresses' for the raw data structure returned by the API

Implements blueprint native-nova-instance
Change-Id: I4136da22961c8aa90e3fc8a9411457622f1909fb

11 years agoMerge "Remove aws_creds from DB API"
Jenkins [Wed, 28 Aug 2013 20:55:15 +0000 (20:55 +0000)]
Merge "Remove aws_creds from DB API"

11 years agoMerge "Provide user control for maximum nesting depth"
Jenkins [Wed, 28 Aug 2013 20:29:44 +0000 (20:29 +0000)]
Merge "Provide user control for maximum nesting depth"

11 years agoMerge "Change localhost references in test_nested_stack"
Jenkins [Wed, 28 Aug 2013 20:29:36 +0000 (20:29 +0000)]
Merge "Change localhost references in test_nested_stack"

11 years agoGenerate docs using new properties Schema class
Zane Bitter [Wed, 28 Aug 2013 16:35:39 +0000 (18:35 +0200)]
Generate docs using new properties Schema class

Change-Id: Ic7849a7aaeeb88379695557f7992330f83638c48

11 years agoGive Property constraints a string representation
Zane Bitter [Wed, 28 Aug 2013 16:35:39 +0000 (18:35 +0200)]
Give Property constraints a string representation

This will enable constraints to describe themselves when we generate
documentation.

Change-Id: Iba410f11c79d1e5d677a5d8aba90052d1c88528a

11 years agoFix CFN API error responses
Liang Chen [Wed, 28 Aug 2013 14:55:42 +0000 (22:55 +0800)]
Fix CFN API error responses

A remote exception (included in conf.allowed_rpc_exception_modules)
is now restored to a subclass of its original type (with the
exception of non heap types which will always be restored to its
original type). Catching rpc_common.RemoteError is not enough
anymore.

Fixes bug #1214831

Change-Id: Iae3ce0c9d0d3f6565fab25ec899f83f19d46e81b

11 years agoMerge "TemplateResources need to download from local "file://" urls"
Jenkins [Wed, 28 Aug 2013 14:46:32 +0000 (14:46 +0000)]
Merge "TemplateResources need to download from local "file://" urls"

11 years agoMerge "Add support for local file urls"
Jenkins [Wed, 28 Aug 2013 14:45:00 +0000 (14:45 +0000)]
Merge "Add support for local file urls"

11 years agoMerge "Add the api config opts in groups to deal with the single heat.conf"
Jenkins [Wed, 28 Aug 2013 14:18:15 +0000 (14:18 +0000)]
Merge "Add the api config opts in groups to deal with the single heat.conf"

11 years agoRemove aws_creds from DB API
Steven Hardy [Wed, 28 Aug 2013 10:09:15 +0000 (11:09 +0100)]
Remove aws_creds from DB API

aws_creds has been removed from the DB and the model, needs
removing from the API too

bug #1215850

Change-Id: I008acc13576c857d9e6238f186424e43dcdd7850

11 years agoMerge "Make logical_resource_id renaming backward compatible"
Jenkins [Wed, 28 Aug 2013 08:40:02 +0000 (08:40 +0000)]
Merge "Make logical_resource_id renaming backward compatible"

11 years agoTemplateResources need to download from local "file://" urls
Angus Salkeld [Mon, 26 Aug 2013 23:12:21 +0000 (09:12 +1000)]
TemplateResources need to download from local "file://" urls

This is ONLY when the template is from the global environment
(not user provided).

Change-Id: Id554b098fdeaaf04e7bb1a8e2e80abe6d484ae9c

11 years agoAdd support for local file urls
Angus Salkeld [Mon, 26 Aug 2013 04:37:05 +0000 (14:37 +1000)]
Add support for local file urls

Change-Id: Ie54508ade52b80790d11958a820998c902d10fd7

11 years agoProvide user control for maximum nesting depth
Clint Byrum [Tue, 27 Aug 2013 16:10:54 +0000 (09:10 -0700)]
Provide user control for maximum nesting depth

In the case of an infinitely recursing stack, Heat will continue to
keep nesting stacks until python's maximum stack recursion depth
is reached. By this point a lot of memory and time may have been
spent parsing/loading/etc.

The default of 3 is enough to deploy a stack of stacks of stacks. It
can be raised by deployers if there is a desire to do larger and more
complicated stacks, at the cost of more resource utilization.

Fixes bug #1214239

Change-Id: Ic492ef84b94b1f715c49eef7e1794a486fb8182f

11 years agoCleanup the Properties doc strings
Angus Salkeld [Wed, 28 Aug 2013 00:06:55 +0000 (10:06 +1000)]
Cleanup the Properties doc strings

This is just fixing the errors/warning from "make html"
The examples needed to be escaped with code blocks "::".

Change-Id: Ic55d3af38aea70f83dabb7e2a8e8b9069a930fd7

11 years agoAdd auto code api doc generation
Angus Salkeld [Tue, 27 Aug 2013 23:56:43 +0000 (09:56 +1000)]
Add auto code api doc generation

This will document the python api to:
heat.api
heat.engine (not the resources as we have docs for those)
heat.rpc

(copied from ceilometer)

Change-Id: I5a400f72d4ec115fb700ab8b24dbccf0b5cd3200

11 years agoImplement interruption-free update and rollback
Zane Bitter [Tue, 27 Aug 2013 18:15:08 +0000 (20:15 +0200)]
Implement interruption-free update and rollback

During an update, where a resource must be replaced in its entirety, create
the replacement resource before deleting the old resource.

Also, allow rollback to the previous version of the resource without
replacing it, where that is possible.

Fixes bug #1176142

Change-Id: Id89654bad297815bdbcc86f666367772889b5df4

11 years agoRemove unnecessary aws_* from user_creds
Steven Hardy [Fri, 23 Aug 2013 10:28:01 +0000 (11:28 +0100)]
Remove unnecessary aws_* from user_creds

We currently store aws_creds, but it's never used in any of the clients
which consume the stored context.  It makes sense to remove it from the
DB, but leave it in heat/common/context.py; then the credentials used for
real requests *to* heat (authenticated via the ec2token middleware) are
obtainable in the context, but we don't populate them in context to be
used in client connections for requests going *from* heat.

Fixes bug #1215850

Change-Id: I7a75c70beb0318a1e83ac0ab45d13802999d1282

11 years agoRemove unused service_* columns from user_creds
Steven Hardy [Fri, 23 Aug 2013 10:16:13 +0000 (11:16 +0100)]
Remove unused service_* columns from user_creds

The service_user and service_password columns are not used anywhere
so remove the columns from the DB and the model

bug #1215850

Change-Id: If2df8cb768a1e2b10897cc09d64df5bcb1c7cd24

11 years agoMerge "Rename OS::Metering::Alarm to OS::Ceilometer::Alarm"
Jenkins [Tue, 27 Aug 2013 16:58:53 +0000 (16:58 +0000)]
Merge "Rename OS::Metering::Alarm to OS::Ceilometer::Alarm"

11 years agoMerge "Catch a NotFound exception in signal_responder delete"
Jenkins [Tue, 27 Aug 2013 16:58:50 +0000 (16:58 +0000)]
Merge "Catch a NotFound exception in signal_responder delete"

11 years agoChange localhost references in test_nested_stack
Clint Byrum [Tue, 27 Aug 2013 16:04:28 +0000 (09:04 -0700)]
Change localhost references in test_nested_stack

These references are using localhost which may be running a server and
provide valid responses, contaminating the test. Using RFC2606's
recommended test TLD of '.test' ensures that these will never resolve.

Change-Id: Ie555a321c2af23fbcf4aca9207acb6a0e40bb703

11 years agoMerge "Add VPCZoneIdentifier attribute for autoscaling"
Jenkins [Tue, 27 Aug 2013 14:42:33 +0000 (14:42 +0000)]
Merge "Add VPCZoneIdentifier attribute for autoscaling"

11 years agoAdd schema for security group rule
Simon Pasquier [Tue, 27 Aug 2013 13:43:30 +0000 (15:43 +0200)]
Add schema for security group rule

This applies to the SecurityGroupEgress and SecurityGroupIngress
properties of the AWS::EC2::SecurityGroup resources.

Change-Id: I339227190db42707560f00cc825bc791d2bde5ce
Fixes: bug #1214333
11 years agoMerge "Improve error message for nova unknown status"
Jenkins [Tue, 27 Aug 2013 13:08:29 +0000 (13:08 +0000)]
Merge "Improve error message for nova unknown status"

11 years agoDon't delete failed instances in InstanceGroup
Christopher Armstrong [Mon, 26 Aug 2013 17:52:53 +0000 (12:52 -0500)]
Don't delete failed instances in InstanceGroup

This gets rid of the code to delete failed instances in
InstanceGroup so that administrators can debug what happened
if any instances fail to start. It also allows the resize operation
to raise an error, so the InstanceGroup should be in a FAILED state
after a failed resize operation.

fixes bug 1214007
fixes bug 1215140

Change-Id: Id508195c847f09dd986e450f35876ff574ff7673

11 years agoMerge "Include Description in conversion from legacy Property schema"
Jenkins [Tue, 27 Aug 2013 10:45:32 +0000 (10:45 +0000)]
Merge "Include Description in conversion from legacy Property schema"

11 years agoMerge "Remove backup resources on stack delete"
Jenkins [Tue, 27 Aug 2013 10:18:52 +0000 (10:18 +0000)]
Merge "Remove backup resources on stack delete"

11 years agoMerge "Add a DB API to swap two resources between stacks"
Jenkins [Tue, 27 Aug 2013 08:51:06 +0000 (08:51 +0000)]
Merge "Add a DB API to swap two resources between stacks"

11 years agoAdd VPCZoneIdentifier attribute for autoscaling
Simon Pasquier [Wed, 21 Aug 2013 09:52:27 +0000 (11:52 +0200)]
Add VPCZoneIdentifier attribute for autoscaling

For now, only one subnet can be specified in the launch configuration because
Neutron doesn't have the ability to map subnets with availability zones.
See bug #1096017 for details.

Change-Id: I46ef4d17b2109c97664f7606c97b16071553ebcd
Fixes: bug #1196494
11 years agoMake logical_resource_id renaming backward compatible
Liang Chen [Tue, 27 Aug 2013 05:05:05 +0000 (13:05 +0800)]
Make logical_resource_id renaming backward compatible

The rename of logical_resource_id to resource_name changed the
return value of resource and event API. Adding a redundant
logical_resource_id back to make the change backward compatible.

Change-Id: I08ab00e38bae6e9bbaf8387dc01effaf776d0b3c

11 years agoAdd the missing heat.po files into heat
YangLei [Tue, 27 Aug 2013 04:27:17 +0000 (12:27 +0800)]
Add the missing heat.po files into heat

There is only one file "heat.pot" in heat/locale/.
We need to add the missing heat.po files.
I updated "heat.pot" file and added the supported languages
(Take glance po files as reference).
The added files are used for
setting up the structure of directory.
The po file doesn't have any translated strings.

Fixes bug #1217172

Change-Id: I1e017c332c80eb01b04e042b5da0129198169bd5

11 years agoMerge "Support native naming in InstanceGroup"
Jenkins [Tue, 27 Aug 2013 03:47:53 +0000 (03:47 +0000)]
Merge "Support native naming in InstanceGroup"

11 years agoMerge "Autoload Nova extensions"
Jenkins [Tue, 27 Aug 2013 02:56:30 +0000 (02:56 +0000)]
Merge "Autoload Nova extensions"

11 years agoMerge "Add a "rollback" parameter to StackUpdate"
Jenkins [Tue, 27 Aug 2013 02:30:46 +0000 (02:30 +0000)]
Merge "Add a "rollback" parameter to StackUpdate"

11 years agoMerge "Always resolve properties against the current stack"
Jenkins [Tue, 27 Aug 2013 02:30:44 +0000 (02:30 +0000)]
Merge "Always resolve properties against the current stack"

11 years agoMerge "Adds support for Neutron Firewall"
Jenkins [Tue, 27 Aug 2013 02:30:25 +0000 (02:30 +0000)]
Merge "Adds support for Neutron Firewall"

11 years agoAdd the api config opts in groups to deal with the single heat.conf
Angus Salkeld [Tue, 27 Aug 2013 00:26:53 +0000 (10:26 +1000)]
Add the api config opts in groups to deal with the single heat.conf

So first off, I also don't like the replicating of the api_opts in wsgi.py
but if I don't do that the sample generator doesn't work:(

We add the wsgi options into a group for each of the api servers with
the deprecated group of "DEFAULT" so it still deals with the flat layout.

The behaviour is as follows (assuming heat-api):
1) if you have both (/etc/heat/{heat.conf, heat-api.conf}
   the value in heat-api.conf wins over heat.conf
2) if you have just one of the config files but a value in both the
   [DEFAULT] section and the [heat-api] section then the value in heat-api
   wins.

bug #1209141
Change-Id: I66ddb3dca91d13b28e68dfb4306e94eb4e537fa7

11 years agoRename OS::Metering::Alarm to OS::Ceilometer::Alarm
Angus Salkeld [Fri, 23 Aug 2013 06:30:12 +0000 (16:30 +1000)]
Rename OS::Metering::Alarm to OS::Ceilometer::Alarm

The other resources are named by project so this is to
try and be more consistent.

There is a mapping to allow the original name to work.

Change-Id: If60cc577a5a770bdaada70c7eae1ae3fc1776056

11 years agoCatch a NotFound exception in signal_responder delete
Angus Salkeld [Thu, 22 Aug 2013 07:17:33 +0000 (17:17 +1000)]
Catch a NotFound exception in signal_responder delete

If the alarm does not get created (error condition) and
the url does not get created (no one referenced it) then
the delete will fail with a NotFound.

Change-Id: I431ebef9b9341548176d977e336558df9f5deb6c

11 years agoImprove error message for nova unknown status
Steve Baker [Thu, 22 Aug 2013 01:39:05 +0000 (13:39 +1200)]
Improve error message for nova unknown status

The current message is obtuse and fails the zbitter
test of good taste.

Change-Id: I12b6904f78452a7dedf3265af4930ba0fc6902a1

11 years agoMerge "Use oslo.sphinx for the doc templates"
Jenkins [Mon, 26 Aug 2013 22:09:48 +0000 (22:09 +0000)]
Merge "Use oslo.sphinx for the doc templates"

11 years agoRemove backup resources on stack delete
Zane Bitter [Mon, 26 Aug 2013 19:11:59 +0000 (21:11 +0200)]
Remove backup resources on stack delete

If any resources are cached as backups after a failed stack update +
rollback, ensure they are deleted when the stack itself is deleted.

Change-Id: I1e271cec146681759cc657ba82c205a648339ec1

11 years agoAdd a DB API to swap two resources between stacks
Zane Bitter [Mon, 26 Aug 2013 19:11:59 +0000 (21:11 +0200)]
Add a DB API to swap two resources between stacks

When rolling back a stack update, we will need to swap the current and
previous (backup) resources so that the former moves to the backup stack
while the latter returns to the current stack. This API allows us to effect
the switch using a database transaction (thus avoiding having to create a
*third* stack).

Change-Id: I2b7247e384e3914778179260e198e5ae5c701525

11 years agoAdd a "rollback" parameter to StackUpdate
Zane Bitter [Mon, 26 Aug 2013 19:11:59 +0000 (21:11 +0200)]
Add a "rollback" parameter to StackUpdate

We can only consider restoring backup resources during a rollback
operation. If they are present during a standard update, there is no way of
testing whether or not they match the new template definition, so we need
to treat them differently in this case.

Change-Id: Ibd73ed047486c253a6c06b7340a3a591f0fee3db

11 years agoAlways resolve properties against the current stack
Zane Bitter [Mon, 26 Aug 2013 19:11:58 +0000 (21:11 +0200)]
Always resolve properties against the current stack

During an update, resources can get moved around between stacks. Ensure
that the properties are always resolved against whatever the current stack
is, without needing to replace self.properties.

Change-Id: I09f984cdf4478ca7dda2b0a0f1aa5a63dd2c19bc

11 years agoRemove the rest references to exception.py
Liang Chen [Sun, 18 Aug 2013 12:48:49 +0000 (20:48 +0800)]
Remove the rest references to exception.py

Remove the rest references to Oslo exception.py in Heat code base, so that Oslo
maintainer can go ahead and remove the openstack/common/exception.py file.

Change-Id: I19d325e2117f31a887c593e31b61e25729f7a053

11 years agoSupport native naming in InstanceGroup
Thomas Herve [Mon, 26 Aug 2013 12:46:49 +0000 (14:46 +0200)]
Support native naming in InstanceGroup

The branch adds support for the native neutron load balancer resource in
in InstanceGroup. It also raises an error if a non load balancer
resource is passed.

Implements: blueprint lbaas-resource
Change-Id: I9b6e7341e2d3c9f14be704c7fbce1e318efbc2d4

11 years agoMerge "Implement a load balancer resource using new neutron pool"
Jenkins [Mon, 26 Aug 2013 11:35:56 +0000 (11:35 +0000)]
Merge "Implement a load balancer resource using new neutron pool"

11 years agoMerge "Allow in-place update of nested stack"
Jenkins [Mon, 26 Aug 2013 11:20:27 +0000 (11:20 +0000)]
Merge "Allow in-place update of nested stack"

11 years agoMerge "Enhance StackResource update for more use cases"
Jenkins [Mon, 26 Aug 2013 11:20:20 +0000 (11:20 +0000)]
Merge "Enhance StackResource update for more use cases"

11 years agoInclude Description in conversion from legacy Property schema
Zane Bitter [Mon, 26 Aug 2013 10:29:06 +0000 (12:29 +0200)]
Include Description in conversion from legacy Property schema

Change-Id: I042afdc3b5e3d4677c207e53497e3bcceb6739ad

11 years agoAdd support for source security groups
Simon Pasquier [Wed, 14 Aug 2013 13:00:44 +0000 (15:00 +0200)]
Add support for source security groups

This patch adds support for the SourceSecurityGroupName and
SourceSecurityGroupId properties. It covers Nova and Neutron.

Change-Id: Ic12512dfb4375ccccbe1282bb48b80cde16ceb9d
Fixes: bug #1193415
11 years agoAdds support for Neutron Firewall
Sumit Naiksatam [Thu, 22 Aug 2013 21:27:45 +0000 (14:27 -0700)]
Adds support for Neutron Firewall

Introduces the following Neutron Firewall as a Service (FWaaS)
components to Heat resources:
* Firewall
* FirewallPolicy
* FirewallRule

Change-Id: I646a1402a336e7cc7c88d555cc836614bda9dca2
Implements: blueprint fwaas-heat

11 years agoMerge "Only create user_creds row on initial stack store"
Jenkins [Mon, 26 Aug 2013 02:31:42 +0000 (02:31 +0000)]
Merge "Only create user_creds row on initial stack store"

11 years agoMerge "remove unused config options"
Jenkins [Mon, 26 Aug 2013 01:52:25 +0000 (01:52 +0000)]
Merge "remove unused config options"

11 years agoMerge "Process request exceptions while fetching template"
Jenkins [Mon, 26 Aug 2013 01:40:31 +0000 (01:40 +0000)]
Merge "Process request exceptions while fetching template"

11 years agoMerge "Use system locale when Accept-Language header is not provided"
Jenkins [Mon, 26 Aug 2013 01:40:24 +0000 (01:40 +0000)]
Merge "Use system locale when Accept-Language header is not provided"

11 years agoMerge "Fix incorrect use of ServerError"
Jenkins [Mon, 26 Aug 2013 01:21:52 +0000 (01:21 +0000)]
Merge "Fix incorrect use of ServerError"

11 years agoAutoload Nova extensions
Tim Smith [Sun, 25 Aug 2013 01:07:23 +0000 (18:07 -0700)]
Autoload Nova extensions

This patch adds logic to autoload standard novaclient extensions
(e.g. baremetal) and any third-party extensions that might
be installed. Thus, resource plugins that make use of
installed extensions are able to use the standard OpenStackClients
rather than have to a) subclass and override OpenStackClients
or b) create a shadow nova client within the resource plugin
with the desired extension loaded.

Change-Id: Ifdcaa896babda0e1e7e10a55253a8baa37582264