]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
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 agoMerge "Fix install.sh calling setup.py"
Jenkins [Mon, 26 Aug 2013 01:12:24 +0000 (01:12 +0000)]
Merge "Fix install.sh calling setup.py"

11 years agoMerge "Store the backup stack during updates"
Jenkins [Mon, 26 Aug 2013 00:19:48 +0000 (00:19 +0000)]
Merge "Store the backup stack during updates"

11 years agoMerge "Pass owner_id to stack_get_by_name()"
Jenkins [Mon, 26 Aug 2013 00:19:45 +0000 (00:19 +0000)]
Merge "Pass owner_id to stack_get_by_name()"

11 years agoMerge "Add a method of creating a backup stack in the DB"
Jenkins [Mon, 26 Aug 2013 00:19:38 +0000 (00:19 +0000)]
Merge "Add a method of creating a backup stack in the DB"

11 years agoMerge "Allow a Provider with a known facade its own schema"
Jenkins [Mon, 26 Aug 2013 00:04:54 +0000 (00:04 +0000)]
Merge "Allow a Provider with a known facade its own schema"

11 years agoMerge "Evaluate lazy translation in exception __str__"
Jenkins [Sun, 25 Aug 2013 23:21:18 +0000 (23:21 +0000)]
Merge "Evaluate lazy translation in exception __str__"

11 years agoMerge "Handling re-delete in rackspace db resource"
Jenkins [Sun, 25 Aug 2013 22:03:19 +0000 (22:03 +0000)]
Merge "Handling re-delete in rackspace db resource"

11 years agoMerge "Replace httplib with requests for ec2tokens auth"
Jenkins [Sun, 25 Aug 2013 20:39:38 +0000 (20:39 +0000)]
Merge "Replace httplib with requests for ec2tokens auth"

11 years agoMerge "Use the global environment to map Quantum to Neutron"
Jenkins [Sat, 24 Aug 2013 00:17:44 +0000 (00:17 +0000)]
Merge "Use the global environment to map Quantum to Neutron"

11 years agoMerge "Add a has_interface() method to the resource class"
Jenkins [Sat, 24 Aug 2013 00:17:37 +0000 (00:17 +0000)]
Merge "Add a has_interface() method to the resource class"

11 years agoStore the backup stack during updates
Zane Bitter [Fri, 23 Aug 2013 23:05:47 +0000 (01:05 +0200)]
Store the backup stack during updates

Change-Id: I64e19b0117c98eced4308727594b77e938d7ee4c

11 years agoPass owner_id to stack_get_by_name()
Zane Bitter [Fri, 23 Aug 2013 23:05:47 +0000 (01:05 +0200)]
Pass owner_id to stack_get_by_name()

The heat.db.sqlalchemy.api supports this parameters, but heat.db.api did
not.

Change-Id: Ic805dcf6c8afdbe9e667c55d9c3b6864a76ce19a

11 years agoAdd a method of creating a backup stack in the DB
Zane Bitter [Fri, 23 Aug 2013 23:05:47 +0000 (01:05 +0200)]
Add a method of creating a backup stack in the DB

This is a temporary storage place for resources that are going to be
deleted once their replacements are created. They must be moved out of
the stack in order to avoid conflicting with the replacement resource.

Change-Id: I081498f4c8732f893dc0d0677cf2b3f40f56d808

11 years agoMerge "Always validate auth_uri with allowed_auth_uris"
Jenkins [Fri, 23 Aug 2013 17:04:35 +0000 (17:04 +0000)]
Merge "Always validate auth_uri with allowed_auth_uris"

11 years agoMerge "Rename event logical_resource_id to resource_name"
Jenkins [Fri, 23 Aug 2013 15:49:24 +0000 (15:49 +0000)]
Merge "Rename event logical_resource_id to resource_name"

11 years agoEvaluate lazy translation in exception __str__
Liang Chen [Thu, 8 Aug 2013 10:11:48 +0000 (18:11 +0800)]
Evaluate lazy translation in exception __str__

The OpenStackException.__str__ method returns
self._error_string which is actually a gettextutil.Message
object not a str.

str(o) will check the return type of o.__str__() and raise
TypeError if __str__ returns non-string object.

The fix will not go into oslo as OpenStackException is
about to be deprecated. And this patch is also the first
step to remove all the references to oslo exception.py.

Fixes bug #1208454

Change-Id: Ib6abe3517bcb1b34fc6a71e5c46ee3774e067f9a

11 years agoAllow a Provider with a known facade its own schema
Zane Bitter [Fri, 23 Aug 2013 13:56:41 +0000 (15:56 +0200)]
Allow a Provider with a known facade its own schema

Allow a TemplateResource behind the facade of a known plugin to supply a
different schema to the facade resource. However, check during validation
that the two are basically compatible. The provider template must:

- Define parameters for all *required* properties of the facade.
- Define parameters that map to the same types as the facade properties.
- Not have *required* parameters that do not exist in the facade.
- Define outputs for all attributes of the facade.

Change-Id: Ie40ecbb43d3d6749266f2cb6d723c8537fcc23dd

11 years agoUse the global environment to map Quantum to Neutron
Angus Salkeld [Thu, 8 Aug 2013 01:29:46 +0000 (11:29 +1000)]
Use the global environment to map Quantum to Neutron

Change-Id: Id3ccc0538d79955d0112daf37bcd80dce78a0373

11 years agoAdd a has_interface() method to the resource class
Angus Salkeld [Tue, 20 Aug 2013 05:37:26 +0000 (15:37 +1000)]
Add a has_interface() method to the resource class

This is to better indentify resource types, given that they
can be mapped in the environment.

Change-Id: I6dd552c87b80eb34baec306acd663657ee929b30

11 years agoMerge "Pass token as a callable to Ceilometer client"
Jenkins [Fri, 23 Aug 2013 13:00:43 +0000 (13:00 +0000)]
Merge "Pass token as a callable to Ceilometer client"

11 years agoMerge "Remove the Property.schema_from_param() method"
Jenkins [Fri, 23 Aug 2013 13:00:36 +0000 (13:00 +0000)]
Merge "Remove the Property.schema_from_param() method"

11 years agoMerge "Generate property Schema objects directly from parameters"
Jenkins [Fri, 23 Aug 2013 13:00:29 +0000 (13:00 +0000)]
Merge "Generate property Schema objects directly from parameters"

11 years agoMerge "Use Template to instantiate TemplateResource"
Jenkins [Fri, 23 Aug 2013 13:00:22 +0000 (13:00 +0000)]
Merge "Use Template to instantiate TemplateResource"

11 years agoMerge "Use string constants to prevent typo errors"
Jenkins [Fri, 23 Aug 2013 11:14:17 +0000 (11:14 +0000)]
Merge "Use string constants to prevent typo errors"

11 years agoMerge "Add a CloudWatch::Alarm implementation based on Ceilometer"
Jenkins [Fri, 23 Aug 2013 11:14:15 +0000 (11:14 +0000)]
Merge "Add a CloudWatch::Alarm implementation based on Ceilometer"

11 years agoMerge "To support both CW and CM, return alarmurl from policy ref"
Jenkins [Fri, 23 Aug 2013 11:14:13 +0000 (11:14 +0000)]
Merge "To support both CW and CM, return alarmurl from policy ref"

11 years agoremove unused config options
Steven Hardy [Fri, 23 Aug 2013 09:57:16 +0000 (10:57 +0100)]
remove unused config options

There are several historical cut/paste unused options, which have
also now found there way into heat.conf.sample, which will confuse
users, so best to remove them.

Fixes bug #1215834

Change-Id: I0fe4717327fc67fe109bef4ba1758d2f18e84520

11 years agoMerge "Do not delete nova server on create fail"
Jenkins [Fri, 23 Aug 2013 08:45:00 +0000 (08:45 +0000)]
Merge "Do not delete nova server on create fail"

11 years agoPass token as a callable to Ceilometer client
Swann Croiset [Mon, 19 Aug 2013 12:06:01 +0000 (14:06 +0200)]
Pass token as a callable to Ceilometer client

fixes bug #1209240

Change-Id: I5e3e3bb15135273c887f9518f148f17e8953fc96

11 years agoMerge "Do not assume nova provides a fault on ERROR"
Jenkins [Fri, 23 Aug 2013 08:29:24 +0000 (08:29 +0000)]
Merge "Do not assume nova provides a fault on ERROR"

11 years agoMerge "Add a script show all possible state transitions"
Jenkins [Fri, 23 Aug 2013 08:29:22 +0000 (08:29 +0000)]
Merge "Add a script show all possible state transitions"

11 years agoMerge "Convert heat.common.template_format to use C yaml"
Jenkins [Fri, 23 Aug 2013 06:33:46 +0000 (06:33 +0000)]
Merge "Convert heat.common.template_format to use C yaml"

11 years agoMerge "Fix the main docs index page"
Jenkins [Fri, 23 Aug 2013 06:33:39 +0000 (06:33 +0000)]
Merge "Fix the main docs index page"

11 years agoMerge "Remove the usecases from environment.py as they are in the docs"
Jenkins [Fri, 23 Aug 2013 06:32:19 +0000 (06:32 +0000)]
Merge "Remove the usecases from environment.py as they are in the docs"

11 years agoMerge "Add some basic evironment docs"
Jenkins [Fri, 23 Aug 2013 06:29:46 +0000 (06:29 +0000)]
Merge "Add some basic evironment docs"

11 years agoMerge "Store the generated signed urls in resource_data"
Jenkins [Fri, 23 Aug 2013 05:28:00 +0000 (05:28 +0000)]
Merge "Store the generated signed urls in resource_data"

11 years agoMerge "Remove "lazy=joined" from the resource_data backref"
Jenkins [Fri, 23 Aug 2013 05:27:58 +0000 (05:27 +0000)]
Merge "Remove "lazy=joined" from the resource_data backref"

11 years agoMerge "Try to reduce the number of tests with the same stack_id"
Jenkins [Fri, 23 Aug 2013 05:23:34 +0000 (05:23 +0000)]
Merge "Try to reduce the number of tests with the same stack_id"

11 years agoMerge "Implement Fn::MemberListToMap"
Jenkins [Fri, 23 Aug 2013 05:23:26 +0000 (05:23 +0000)]
Merge "Implement Fn::MemberListToMap"

11 years agoMerge "Limit maximum size of all templates"
Jenkins [Fri, 23 Aug 2013 04:26:57 +0000 (04:26 +0000)]
Merge "Limit maximum size of all templates"

11 years agoMerge "Make the API for getting dependency graph edges public"
Jenkins [Fri, 23 Aug 2013 01:27:15 +0000 (01:27 +0000)]
Merge "Make the API for getting dependency graph edges public"

11 years agoRename event logical_resource_id to resource_name
Liang Chen [Sun, 18 Aug 2013 12:38:04 +0000 (20:38 +0800)]
Rename event logical_resource_id to resource_name

This is to address an unimplemented comment at
https://review.openstack.org/#/c/41290/2/heat/engine/event.py
Bascically, there is a logical_resource_id/resource_name mismatch to
address, and this patch is trying to resolve that.

Change-Id: Idac696259af30f8db7816499474057c354d73800

11 years agoMerge "Pass the previous stack to StackUpdate"
Jenkins [Fri, 23 Aug 2013 01:24:58 +0000 (01:24 +0000)]
Merge "Pass the previous stack to StackUpdate"

11 years agoUse string constants to prevent typo errors
Angus Salkeld [Thu, 15 Aug 2013 04:16:15 +0000 (14:16 +1000)]
Use string constants to prevent typo errors

Change-Id: If8fccaa3f5d77698a50f803c2b97b85c5a7613ea

11 years agoAdd a CloudWatch::Alarm implementation based on Ceilometer
Angus Salkeld [Wed, 14 Aug 2013 11:55:59 +0000 (21:55 +1000)]
Add a CloudWatch::Alarm implementation based on Ceilometer

It's off by default for the moment so the current cloudwatch tests can run.

Change-Id: Ibdce9c9223969bdcb8f2368e98dc6ab1241b84df

11 years agoTo support both CW and CM, return alarmurl from policy ref
Angus Salkeld [Mon, 19 Aug 2013 23:46:59 +0000 (09:46 +1000)]
To support both CW and CM, return alarmurl from policy ref

This is so we can still have the following:
  AlarmActions:
  - {Ref: ServerScaleUpPolicy}

and use Ceilometer underneath.

The watchrule now tries to look up the resource by
both name and resource_by_refid.

Change-Id: I4759806919ab4f3ccef66698235b23f7f310cb03

11 years agoStore the generated signed urls in resource_data
Angus Salkeld [Wed, 14 Aug 2013 06:57:13 +0000 (16:57 +1000)]
Store the generated signed urls in resource_data

This is so it does get regenerated everytime GetRefId() is called.

fixes bug 1206505
Change-Id: Ia69d6d65247555918850ecaadfd1c5d1bc837af8

11 years agoRemove "lazy=joined" from the resource_data backref
Angus Salkeld [Wed, 14 Aug 2013 06:51:21 +0000 (16:51 +1000)]
Remove "lazy=joined" from the resource_data backref

This is having some weird interaction with the rsrc_metadata column.
In a later patch I add a call to resource_data_set() in signal_responder
and the metadata tests start failing.

Change-Id: Ib59972fe69570f4ae36e672987419f4841a2de40

11 years agoTry to reduce the number of tests with the same stack_id
Angus Salkeld [Wed, 14 Aug 2013 05:47:33 +0000 (15:47 +1000)]
Try to reduce the number of tests with the same stack_id

Change-Id: I38a689ed65998adc9a3e6542d11d15283ae61044

11 years agoImplement Fn::MemberListToMap
Angus Salkeld [Thu, 22 Aug 2013 22:31:54 +0000 (08:31 +1000)]
Implement Fn::MemberListToMap

This is to allow the CloudWatch::Alarm to be implemented as
a resource template. The Dimensions need to be converted
from [{Name: bla, Value: foo}] into a normal dict.

So we define the Dimensions as a CommaDelimitedList in the template,
then in TemplateResource we see that the property is a list of dicts
and convert it into the aws style memberlist
 '.member.0.Name=bla,.member.0.Value=green'
then in the CW template we can do the following:

matching_metadata:
  "Fn::MemberListToMap": [Name, Value, {"Fn::   Split": [",",
{Ref: Dimensions}]}]

Note: this in not a single case usage as we can use this for the Tags
property that is in a lot of other resources.

Change-Id: I68910c51eaeb0857531028e87b89b9192db4c8ba

11 years agoFix the main docs index page
Angus Salkeld [Thu, 22 Aug 2013 23:51:55 +0000 (09:51 +1000)]
Fix the main docs index page

This magic new line makes the main index look a lot better.
It wasn't showing the "HOT templates" level.

Change-Id: I3f7fb65911a4b0f3ad57ddf22c00ec8236261c7e

11 years agoRemove the usecases from environment.py as they are in the docs
Angus Salkeld [Thu, 22 Aug 2013 23:54:31 +0000 (09:54 +1000)]
Remove the usecases from environment.py as they are in the docs

Change-Id: Ibe0b55663a62b4a68f1478d254f1333a56514c38

11 years agoAdd some basic evironment docs
Angus Salkeld [Thu, 22 Aug 2013 23:49:39 +0000 (09:49 +1000)]
Add some basic evironment docs

Change-Id: I6edbb7da0d333bd86eabba73631d5df3d4dc8328

11 years agoDo not delete nova server on create fail
Steve Baker [Thu, 22 Aug 2013 01:32:01 +0000 (13:32 +1200)]
Do not delete nova server on create fail

To keep in line with the behaviour of other resources,
a nova server should only be deleted on resource delete.

Fixes bug: #1215132

Change-Id: Ic478754b7b96001fa0d4110a66d008609de7b482

11 years agoDo not assume nova provides a fault on ERROR
Steve Baker [Thu, 22 Aug 2013 01:18:57 +0000 (13:18 +1200)]
Do not assume nova provides a fault on ERROR

A nova server object in an ERROR state does not
always provide a fault attribute to get the error
reason from.

Fixes bug: #1213285

Change-Id: I861951207cf8fd526a65f768154c76afd0be9081

11 years agoMerge "Improve update debugging messages"
Jenkins [Thu, 22 Aug 2013 21:13:25 +0000 (21:13 +0000)]
Merge "Improve update debugging messages"

11 years agoAdd a script show all possible state transitions
Jason Dunsmore [Wed, 21 Aug 2013 20:15:17 +0000 (15:15 -0500)]
Add a script show all possible state transitions

The output of this script will be useful in documenting all possible
state transitions.

Change-Id: I24e442ce20fe7730c915a77b85014f44075e03fd

11 years agoLimit maximum size of all templates
Clint Byrum [Wed, 21 Aug 2013 20:24:17 +0000 (13:24 -0700)]
Limit maximum size of all templates

Templates of an extremely large size can eat up tons of CPU time,
memory and storage. By refusing to parse any template over a certain
size, we can prevent users from abusing the service.

Fixes bug #1214234

Change-Id: I2f731c8e2fc9e1f497199e310de81fa48c9582af

11 years agoMerge "Add UpdatePolicy attribute to Instance/AutoScalingGroup"
Jenkins [Thu, 22 Aug 2013 13:31:16 +0000 (13:31 +0000)]
Merge "Add UpdatePolicy attribute to Instance/AutoScalingGroup"

11 years agoMake the API for getting dependency graph edges public
Zane Bitter [Thu, 22 Aug 2013 11:01:21 +0000 (13:01 +0200)]
Make the API for getting dependency graph edges public

This will allow us to build new dependency graphs from combinations of
existing graphs.

Change-Id: I6da62607fa1e361d4d2e1581fd286c62f0d9470a

11 years agoPass the previous stack to StackUpdate
Zane Bitter [Thu, 22 Aug 2013 11:01:21 +0000 (13:01 +0200)]
Pass the previous stack to StackUpdate

This starts out like the existing stack, but is not stored in the database
or updated as the stack update proceeds. This allows the StackUpdate object
to store any information that might be relevant to a future rollback.

Change-Id: I94f0dd69b5e7818f811c8c0d50566a79b81acba7

11 years agoImprove update debugging messages
Zane Bitter [Thu, 22 Aug 2013 11:01:21 +0000 (13:01 +0200)]
Improve update debugging messages

Change-Id: I231275c1ce7dcba441a57d2ac29d2ad59e993e98

11 years agoMerge "Use the global environment to define AWS::CloudWatch::Alarm"
Jenkins [Thu, 22 Aug 2013 10:43:04 +0000 (10:43 +0000)]
Merge "Use the global environment to define AWS::CloudWatch::Alarm"

11 years agoMerge "Load deployer/global environment files at startup"
Jenkins [Thu, 22 Aug 2013 10:43:02 +0000 (10:43 +0000)]
Merge "Load deployer/global environment files at startup"

11 years agoMerge "Add an environment_format.py like the template one"
Jenkins [Thu, 22 Aug 2013 10:43:00 +0000 (10:43 +0000)]
Merge "Add an environment_format.py like the template one"

11 years agoMerge "Fix all the sphinx-build warnings"
Jenkins [Thu, 22 Aug 2013 09:23:19 +0000 (09:23 +0000)]
Merge "Fix all the sphinx-build warnings"

11 years agoMerge "Fix some flake8 warnings in doc/resources.py"
Jenkins [Thu, 22 Aug 2013 09:23:17 +0000 (09:23 +0000)]
Merge "Fix some flake8 warnings in doc/resources.py"

11 years agoMerge "Fix crash in "make html" introduced by the global env"
Jenkins [Thu, 22 Aug 2013 09:21:43 +0000 (09:21 +0000)]
Merge "Fix crash in "make html" introduced by the global env"

11 years agoMerge "Add new attributes to EIPAssociation resource"
Jenkins [Thu, 22 Aug 2013 05:28:07 +0000 (05:28 +0000)]
Merge "Add new attributes to EIPAssociation resource"

11 years agoMerge "Introduce nova_utils.server_to_ipaddress"
Jenkins [Thu, 22 Aug 2013 04:00:09 +0000 (04:00 +0000)]
Merge "Introduce nova_utils.server_to_ipaddress"

11 years agoFix all the sphinx-build warnings
Angus Salkeld [Thu, 22 Aug 2013 02:27:21 +0000 (12:27 +1000)]
Fix all the sphinx-build warnings

except this one:
 WARNING: toctree contains reference to nonexisting document u'api/autoindex'

Change-Id: I176a75c1c3fc9603304f11f867df54d7a7b3610a

11 years agoFix some flake8 warnings in doc/resources.py
Angus Salkeld [Thu, 22 Aug 2013 01:42:31 +0000 (11:42 +1000)]
Fix some flake8 warnings in doc/resources.py

remove doc from the ignore and just fix the issues in conf.py

Change-Id: I30833dd24409087c3482d2034a797fea3f90aa85

11 years agoFix crash in "make html" introduced by the global env
Angus Salkeld [Thu, 22 Aug 2013 01:34:47 +0000 (11:34 +1000)]
Fix crash in "make html" introduced by the global env

Change-Id: Iece0e122841829d3561b71575065ffa7b656b504

11 years agoReplace httplib with requests for ec2tokens auth
Steve Baker [Wed, 21 Aug 2013 21:51:24 +0000 (09:51 +1200)]
Replace httplib with requests for ec2tokens auth

This vastly simplifies the implementation and test mocking.

ec2token middleware is the last piece of code in the heat
repository to be making direct httplib calls.

Change-Id: I3807b27a7699ff19eb46e2721aaa5afd9d6c8ff9

11 years agoAlways validate auth_uri with allowed_auth_uris
Steve Baker [Mon, 19 Aug 2013 02:35:06 +0000 (14:35 +1200)]
Always validate auth_uri with allowed_auth_uris

The original intention was to allow heat to orchestrate
on any requested cloud when allowed_auth_uris is configured
with an empty list.

This change makes all requests be validated against
allowed_auth_uris for the following reasons:
- there is a potential security issue with requests
  being authorised by a fake keystone, allowing an exploit in
  heat to be executed without any valid authentication factors
  first being presented.
- ec2token middleware will also need to be made multi-cloud aware
  however as a compatible API it is not possible to specify the desired
  auth_uri with each request. Instead ec2token will need a list of
  configured endpoints so that it can try each one until a request
  is authenticated.

Change-Id: I3d6b7edf381a66b87b6e1fae07bc5dbe9db024bc

11 years agoAdd UpdatePolicy attribute to Instance/AutoScalingGroup
Winson Chan [Fri, 16 Aug 2013 18:35:04 +0000 (11:35 -0700)]
Add UpdatePolicy attribute to Instance/AutoScalingGroup

This is the second part of a series to implement support
for AutoScaling UpdatePolicy.

Defined new update_policy attribute for InstanceGroup
and AutoScalingGroup, and modified init of InstanceGroup and
AutoScalingGroup to parse UpdatePolicy from the template.
Currently, only InstanceGroup and AutoScalingGroup manages
update using UpdatePolicy and so this is not implemented in the
Resource class. This can be revisited when UpdatePolicy is
applicable to other resource types. The resource validation
method is also overridden here to validate the UpdatePolicy.
Included tests to validate various uses cases of templates
with, with bad, without, and removal of UpdatePolicy. This
patch does not address handling of instances update with
UpdatePolicy yet. The next patch will address that.

Change-Id: I1faf1a8a3ba1faf063b6687b34b57b2a96c6bfa8
blueprint: as-update-policy

11 years agoUse the global environment to define AWS::CloudWatch::Alarm
Angus Salkeld [Wed, 14 Aug 2013 11:54:32 +0000 (21:54 +1000)]
Use the global environment to define AWS::CloudWatch::Alarm

This will make it easier for the deployer to define the default
implementation.

Change-Id: If1a8dceb4ad2cade90a56f16dd450e571425c4a6

11 years agoLoad deployer/global environment files at startup
Angus Salkeld [Mon, 19 Aug 2013 09:53:34 +0000 (19:53 +1000)]
Load deployer/global environment files at startup

This allows for a global environment that the deployer can use to set
their own defaults.
An example /etc/heat/environment.d/x.yaml

resource_registry:
  "OS::Quantum*": "OS::Neutron*"
  "AWS::RDS::DBInstance": "file:///etc/heat/templates/AWS_RDS_DBInstance.template"

Change-Id: Iee647a109e5a41d41cd4a79909c6edaca0d17b87

11 years agoAdd an environment_format.py like the template one
Angus Salkeld [Tue, 20 Aug 2013 06:35:25 +0000 (16:35 +1000)]
Add an environment_format.py like the template one

This to make the section checking mechanism less spread out
and more consistent. This can also be used by the global
environment loader.

Change-Id: I7ca7ad754fb702877dedc416a30f573d239933ad

11 years agoProcess request exceptions while fetching template
Liang Chen [Wed, 21 Aug 2013 15:24:27 +0000 (23:24 +0800)]
Process request exceptions while fetching template

requests raises subclass of requests.exception.RequestException, not
IOError. And the code explicitly calls raise_for_status to avoid HTTP
errors being silently ignored.

Fixes bug #1214429

Change-Id: Ib3ea7e4fea459a231f0bb7f113e3d66983b006c2

11 years agoAdd new attributes to EIPAssociation resource
Jeff Peeler [Wed, 3 Jul 2013 14:22:25 +0000 (10:22 -0400)]
Add new attributes to EIPAssociation resource

AllocationId
NetworkInterfaceId

The EIP resource also now supports the Domain property, which when set
creates the resource using neutron networking. (Neutron networking is
required for all VPC operations.)

The EIP test covers the new functionality as well as some of the old
using both nova and neutron.

Fixes bug #1164865
Fixes bug #1164866

Change-Id: I7ad7fba8ed6f8a584fc2ca00aaf80144c5274134

11 years agoRemove the Property.schema_from_param() method
Zane Bitter [Mon, 19 Aug 2013 18:51:45 +0000 (20:51 +0200)]
Remove the Property.schema_from_param() method

This is now unused.

Change-Id: I5da20effe72a791d6dd8e9cc99ec9e43dea2da07

11 years agoGenerate property Schema objects directly from parameters
Zane Bitter [Mon, 19 Aug 2013 18:51:45 +0000 (20:51 +0200)]
Generate property Schema objects directly from parameters

Use Schema.from_parameter() instead of Property.schema_from_param() to
generate a property schema from a parameter schema.

Change-Id: I1049822057d954ddbb47027aad136f7b45541943

11 years agoUse Template to instantiate TemplateResource
Zane Bitter [Wed, 21 Aug 2013 14:52:13 +0000 (16:52 +0200)]
Use Template to instantiate TemplateResource

Use the Template class, rather than the raw template data, to obtain the
information required to create the schema of a TemplateResource facade.
This will allow this feature to work with multiple template formats (e.g.
HOT vs. CloudFormation).

Change-Id: Ifde739b081e95ed9f14567f35a0a1680c5e9b631

11 years agoHandling re-delete in rackspace db resource
Vijendar Komalla [Wed, 21 Aug 2013 13:55:43 +0000 (08:55 -0500)]
Handling re-delete in rackspace db resource

Current implementation of db resource throws exception if the
resource was already deleted(All the other resources are not
throwing). This fix is to make db resource behavior similar to
other resources.

Fixes Bug #1197077

Change-Id: I4537180115400e6f6183e72a74bdd3ada220a3fa

11 years agoFix incorrect use of ServerError
Steven Hardy [Wed, 21 Aug 2013 13:09:31 +0000 (14:09 +0100)]
Fix incorrect use of ServerError

ServerError is being incorrectly used to report an internal error
leading to an error formatting the response, as there's no body
specified to the format string.  Use exception.Error instead and
adjust the message to make the user-visible response clearer.

Fixes bug #1214457

Change-Id: I83435686170c4f40658968a35f1faa303f50f4a4

11 years agoMerge "Create a Schema from a parameter"
Jenkins [Wed, 21 Aug 2013 12:46:42 +0000 (12:46 +0000)]
Merge "Create a Schema from a parameter"

11 years agoMerge "Wrap the resource registration in a global environment"
Jenkins [Wed, 21 Aug 2013 11:49:32 +0000 (11:49 +0000)]
Merge "Wrap the resource registration in a global environment"

11 years agoIntroduce nova_utils.server_to_ipaddress
Thomas Herve [Fri, 16 Aug 2013 11:24:55 +0000 (13:24 +0200)]
Introduce nova_utils.server_to_ipaddress

Create a utility function used for now by the instance and load balancer
resources to retrieve one IP of a nova server.

Change-Id: I87ace4c61b03a66f3b0c30f3bacd2fce79332ed0

11 years agoConvert heat.common.template_format to use C yaml
Clint Byrum [Tue, 20 Aug 2013 20:50:00 +0000 (13:50 -0700)]
Convert heat.common.template_format to use C yaml

Will fall back to pyyaml if CSafeLoader/CSafeDumper are not available.
This should increase template parsing performance by a factor of 9 and
reduce memory usage by an order of magnitude.

We also convert the one test that was directly calling yaml to use the
template_format.parse function, so that the same parsing is used
everywhere.

Change-Id: I0d14be2ef7fb2dccac43fc41b1d2d9e4395c6f77
Fixes bug #1214580

11 years agoUse system locale when Accept-Language header is not provided
Jenkins [Tue, 20 Aug 2013 16:54:01 +0000 (16:54 +0000)]
Use system locale when Accept-Language header is not provided

Remove en_US as the default language when no header is provided, and use
None instead. Upon translation None will be defaulted to system as it
was before the translation changes.

Fixes bug: #1214476

Change-Id: I0fe22c526710e69ae0731e7d0b42170e6f3a8523

11 years agoMerge "Allow Description in properties schema"
Jenkins [Tue, 20 Aug 2013 15:15:24 +0000 (15:15 +0000)]
Merge "Allow Description in properties schema"

11 years agoMerge "Allow Parameters to set defaults for TemplateResource"
Jenkins [Tue, 20 Aug 2013 14:15:46 +0000 (14:15 +0000)]
Merge "Allow Parameters to set defaults for TemplateResource"

11 years agoUse LONGTEXT for templates in MySQL
Clint Byrum [Mon, 19 Aug 2013 22:02:53 +0000 (15:02 -0700)]
Use LONGTEXT for templates in MySQL

TEXT in PostgreSQL is an unlimited column size. However, in MySQL, it is
limited to 2^16 bytes. LONGTEXT allows 2^32 bytes, which is overkill,
but will prevent MySQL from silently truncating this column and thus
rendering the entire tenant's API access moot.

Fixes bug #1210799

Change-Id: Ib2b379db32a8296cf8c5a2434e7615afc59288e3

11 years agoWrap the resource registration in a global environment
Angus Salkeld [Mon, 19 Aug 2013 05:28:58 +0000 (15:28 +1000)]
Wrap the resource registration in a global environment

Change-Id: I065dadc9fae19ab21d6d4aeae08334f20da161bb

11 years agoCreate a Schema from a parameter
Zane Bitter [Mon, 19 Aug 2013 18:51:45 +0000 (20:51 +0200)]
Create a Schema from a parameter

Add a classmethod to create a property Schema object directly from a
parameter schema.

Change-Id: I335ec48086ea5aeb1fb2afd9af8e93529d9b6051