]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
12 years agoMerge "Remove unused python-memcached from requirements."
Jenkins [Mon, 17 Jun 2013 00:39:34 +0000 (00:39 +0000)]
Merge "Remove unused python-memcached from requirements."

12 years agoStore stacks in the database when running unit tests
Zane Bitter [Fri, 14 Jun 2013 10:31:23 +0000 (12:31 +0200)]
Store stacks in the database when running unit tests

If stacks are not stored in the database before they are create()'d,
anything that refers to a stack (e.g. Resources and Events) cannot be added
to the database either, and we get numerous errors in any output logs.

Change-Id: Icd1012455d413aad617486c138fd4507e391bc7b

12 years agoUnit tests: Create User for testing AccessKey
Zane Bitter [Fri, 14 Jun 2013 10:31:22 +0000 (12:31 +0200)]
Unit tests: Create User for testing AccessKey

An AccessKey resource is not independent of its associated User resource,
which must be present in the same stack. Consequently, we need to create a
real User resource that is a member of the same stack in order to test the
AccessKey in a realistic environment.

Change-Id: I4b732c93fe9823552baf65c3f9c87c8ebab061a4

12 years agoMerge "Make resource ids UUIDs in the database"
Jenkins [Fri, 14 Jun 2013 09:59:13 +0000 (09:59 +0000)]
Merge "Make resource ids UUIDs in the database"

12 years agoMerge "Gate on H703"
Jenkins [Fri, 14 Jun 2013 08:53:26 +0000 (08:53 +0000)]
Merge "Gate on H703"

12 years agoMake resource ids UUIDs in the database
Zane Bitter [Thu, 13 Jun 2013 18:03:26 +0000 (20:03 +0200)]
Make resource ids UUIDs in the database

Change-Id: I3068e9e818f19994cc3aaecc34845d0d6aac0dfb

12 years agoUnit tests: Don't use mox to stub uuid.uuid4()
Zane Bitter [Thu, 13 Jun 2013 18:03:26 +0000 (20:03 +0200)]
Unit tests: Don't use mox to stub uuid.uuid4()

The wait condition unit tests require a fixed stack ID, but we don't want
to permanently stub out uuid4, since there are other potential uses of
uuids. Instead, just do it for that one operation.

Change-Id: Ib8b7107a5750caf67aa8905377c2755bf405fa3f

12 years agoMerge "allow using image uuid for instance resource"
Jenkins [Thu, 13 Jun 2013 14:52:15 +0000 (14:52 +0000)]
Merge "allow using image uuid for instance resource"

12 years agoMerge "fix an CFN API and AWS error mapping"
Jenkins [Thu, 13 Jun 2013 12:50:52 +0000 (12:50 +0000)]
Merge "fix an CFN API and AWS error mapping"

12 years agoConvert Events to separate action/status
Steven Hardy [Thu, 13 Jun 2013 10:19:32 +0000 (11:19 +0100)]
Convert Events to separate action/status

First step in decoupling action/status in Resource

This adjusts the Event DB columns, model and class to split
action/status, but in order to be backwards compatible we set the action
to None, which means we can do the right thing in the CFN API, and
resource_status still maps correctly to what is expected in
python-heatclient (which will need to change after the Resource
action/status split happens)

Change-Id: I261d47d2a3fdb3cdc2a8aaf6c159763f4636f633

12 years agoMerge "Use Python 3.x compatible except construct"
Jenkins [Thu, 13 Jun 2013 05:32:43 +0000 (05:32 +0000)]
Merge "Use Python 3.x compatible except construct"

12 years agoallow using image uuid for instance resource
Liang Chen [Fri, 7 Jun 2013 02:12:30 +0000 (10:12 +0800)]
allow using image uuid for instance resource

make the instance resource accept image uuid for its ImageId
properties in addition to unique image name.

Fixes bug #1186410

Change-Id: Iae7705e73fe223d80e85d261a04f88f8c5207487

12 years agofix an CFN API and AWS error mapping
Liang Chen [Wed, 12 Jun 2013 13:47:05 +0000 (21:47 +0800)]
fix an CFN API and AWS error mapping

StackExists should return AlreadyExists, not InvalidParameterValue

Fixes bug #1188473

Change-Id: Ia969cddc1b61caa13f4f70bcc29f3160595a779b

12 years agoRemove unused python-memcached from requirements.
Steve Baker [Wed, 12 Jun 2013 01:58:27 +0000 (13:58 +1200)]
Remove unused python-memcached from requirements.

Change-Id: I6da8607203d15275a05faa7f7ccc570c31f86762

12 years agoUse Python 3.x compatible except construct
Dirk Mueller [Wed, 12 Jun 2013 20:55:03 +0000 (22:55 +0200)]
Use Python 3.x compatible except construct

Python 3.x deprecated excecpt x,y. Use except x as y,
which works with any Python version >= 2.6

Change-Id: I264049ee41e75bcedea86adf7c2011c343f47ddb

12 years agoAdd bin/heat-manage to flake8 checks
Dirk Mueller [Wed, 12 Jun 2013 20:54:05 +0000 (22:54 +0200)]
Add bin/heat-manage to flake8 checks

Change-Id: I917e5b0aa571f2fced7df6a4818f32ce4b5f1561

12 years agoGate on H703
Dirk Mueller [Tue, 11 Jun 2013 18:17:18 +0000 (20:17 +0200)]
Gate on H703

Fix fallout by avoiding multiple positional arguments.

Change-Id: Ie25f7b9041fa5df85a244cb237124440bb7d8e32

12 years agoMerge "scheduler: Fix an issue with wrappertasks and exceptions"
Jenkins [Wed, 12 Jun 2013 14:10:23 +0000 (14:10 +0000)]
Merge "scheduler: Fix an issue with wrappertasks and exceptions"

12 years agoMerge "Fix various Sphinx errors/warnings"
Jenkins [Wed, 12 Jun 2013 10:56:52 +0000 (10:56 +0000)]
Merge "Fix various Sphinx errors/warnings"

12 years agoscheduler: Fix an issue with wrappertasks and exceptions
Zane Bitter [Wed, 12 Jun 2013 10:48:25 +0000 (12:48 +0200)]
scheduler: Fix an issue with wrappertasks and exceptions

Using a 'for' loop on a generator is incompatible with calling throw() on
it, because the latter causes the generator to advance to the next yield.
Consequently, ignoring an exception from a subtask in the parent task would
cause the next subtask to be skipped.

This issue does not affect any existing code to date.

The inner and outer loops should each be equivalent to the definition of
"yield from" (http://www.python.org/dev/peps/pep-0380/#formal-semantics) in
PEP 380, with the following simplifications:
 - Assume that the throw() and close() methods exist
 - Don't support send()
 - Don't support return values (these are Python 3-only feature)

Change-Id: Ie29e68d4505f667f408b67b365c37511f73372fe

12 years agoMerge "Remove explicit distribute depend."
Jenkins [Wed, 12 Jun 2013 09:15:47 +0000 (09:15 +0000)]
Merge "Remove explicit distribute depend."

12 years agoMerge "Fix H702 errors and enable them"
Jenkins [Wed, 12 Jun 2013 08:37:25 +0000 (08:37 +0000)]
Merge "Fix H702 errors and enable them"

12 years agoMerge "Key error when auth in standalone mode"
Jenkins [Wed, 12 Jun 2013 07:54:30 +0000 (07:54 +0000)]
Merge "Key error when auth in standalone mode"

12 years agoFix H702 errors and enable them
Angus Salkeld [Tue, 11 Jun 2013 22:43:37 +0000 (08:43 +1000)]
Fix H702 errors and enable them

 - Formatting operation should be outside of localization method call

Change-Id: Icedbb98e46a52b53db7143a4111da13466a26847

12 years agoMerge "Add descriptions of the pep8 checks"
Jenkins [Tue, 11 Jun 2013 22:46:59 +0000 (22:46 +0000)]
Merge "Add descriptions of the pep8 checks"

12 years agoRemove explicit distribute depend.
Monty Taylor [Tue, 11 Jun 2013 18:39:32 +0000 (11:39 -0700)]
Remove explicit distribute depend.

Causes issues with the recent re-merge with setuptools. Advice from
upstream is to stop doing explicit depends.

Change-Id: If390cdf328b361d0f76315083f3e6da97bbe4b2f

12 years agoKey error when auth in standalone mode
Andrew Plunk [Tue, 11 Jun 2013 15:18:10 +0000 (10:18 -0500)]
Key error when auth in standalone mode

Fix a key error caused from the response of authing
in stand alone mode. The keystone docs indicate that
the schema for a response user name is ['user']['name']
rather than ['user']['username'].

Change-Id: I9ac94feeef8f9f2dedaa3842f64a3491e701e199

12 years agoengine : remove GreenletExit workaround
Steven Hardy [Mon, 10 Jun 2013 12:34:57 +0000 (13:34 +0100)]
engine : remove GreenletExit workaround

Both heat and oslo now require the version of greenlet containing
the fix (greenlet>=0.3.2) so we no longer need this workaround

Change-Id: I42af8e020f08480dda08f4b4879c2840e741ea59

12 years agoMerge "Adds possible topdir to python search path"
Jenkins [Tue, 11 Jun 2013 11:40:42 +0000 (11:40 +0000)]
Merge "Adds possible topdir to python search path"

12 years agoAdd descriptions of the pep8 checks
Angus Salkeld [Tue, 11 Jun 2013 03:05:51 +0000 (13:05 +1000)]
Add descriptions of the pep8 checks

Change-Id: Ida2be020b8ed7ea047e11c4b8fa2f5154a444977

12 years agoMerge "Return empty string when Fn::Select target is None."
Jenkins [Tue, 11 Jun 2013 00:30:14 +0000 (00:30 +0000)]
Merge "Return empty string when Fn::Select target is None."

12 years agoMerge "Add Fn::Replace template function."
Jenkins [Tue, 11 Jun 2013 00:30:11 +0000 (00:30 +0000)]
Merge "Add Fn::Replace template function."

12 years agoFix various Sphinx errors/warnings
Dirk Mueller [Mon, 10 Jun 2013 21:49:40 +0000 (23:49 +0200)]
Fix various Sphinx errors/warnings

Change-Id: If34202291b5605302baf47c210b07ffc4ffad094

12 years agoMerge "Initial mariadb support"
Jenkins [Mon, 10 Jun 2013 10:24:01 +0000 (10:24 +0000)]
Merge "Initial mariadb support"

12 years agoMerge "Use Python 3.x compatible octal literals"
Jenkins [Mon, 10 Jun 2013 10:23:02 +0000 (10:23 +0000)]
Merge "Use Python 3.x compatible octal literals"

12 years agoMerge "raise an UnknownUserParameter exception when receiving an unknown param"
Jenkins [Mon, 10 Jun 2013 09:21:17 +0000 (09:21 +0000)]
Merge "raise an UnknownUserParameter exception when receiving an unknown param"

12 years agoUse Python 3.x compatible octal literals
Dirk Mueller [Mon, 10 Jun 2013 07:46:34 +0000 (09:46 +0200)]
Use Python 3.x compatible octal literals

Python 3.x deprecated the 0700 construct. 0o700
works with any version of Python (>= 2.6 tested)

Change-Id: I47fcb79804b75437e6cf4ce966fbfdc05fce26cd

12 years agoAdds possible topdir to python search path
Jianing YANG [Mon, 10 Jun 2013 07:45:43 +0000 (15:45 +0800)]
Adds possible topdir to python search path

Change-Id: Ide47656071c6d17482b1e4ec0727ce316033e702
Fixes: bug #1189354
12 years agoReturn empty string when Fn::Select target is None.
Steve Baker [Sun, 9 Jun 2013 23:44:45 +0000 (11:44 +1200)]
Return empty string when Fn::Select target is None.

This can happen when a resource is not in the required state
to resolve its FnGetAtt.

Change-Id: I4d104b3577fbd94b920ff172c00d60914d7acd45

12 years agoAdd Fn::Replace template function.
Steve Baker [Wed, 5 Jun 2013 01:41:36 +0000 (13:41 +1200)]
Add Fn::Replace template function.

This is implemented with python str.replace

For yaml templates, this should be used as a better alternative to
Fn::Join: ['', [...]]

For json templates, the following common pattern:
"Fn::Join": ["", ["line 1\n", ... "line 2\n"]]
could now become more maintainable as:
"Fn::Replace": [{...}, "Fn::Join": ["\n", ["line 1", ... "line 2"]]]

Implements blueprint template-string-function
Implements blueprint bash-environment-function

Change-Id: Ie4817b1d98dd6d6390e086da9b582d33415a0d9f

12 years agoInitial mariadb support
Attila Fazekas [Sat, 8 Jun 2013 20:38:04 +0000 (22:38 +0200)]
Initial mariadb support

mariadb only differs in the package name from the mysql,
an already installed mariadb should not cause hangup in a
devstack installation.

Fixing Bug 1184722

Change-Id: I3b9d02b703e49044999ff1b9f1195ffcaf1d0cec

12 years agoraise an UnknownUserParameter exception when receiving an unknown param
Liang Chen [Wed, 5 Jun 2013 08:41:14 +0000 (16:41 +0800)]
raise an UnknownUserParameter exception when receiving an unknown param

add some validation logic to Parameters, so that when an invalid param
is passed in an exception will be raised.

Fixes bug #1186790

Change-Id: I8aece556d8fc5cd5533f4baf041e345bdc5722ec

12 years agoEnable H403
Dirk Mueller [Fri, 7 Jun 2013 13:44:23 +0000 (15:44 +0200)]
Enable H403

Fix the only two places where it triggered alongway.

Change-Id: Ib76e0e072c2d51a9c782f37d5f5df964f2db968f

12 years agoget rid of no-op __init__ methods
Christopher Armstrong [Thu, 30 May 2013 20:54:25 +0000 (20:54 +0000)]
get rid of no-op __init__ methods

There were a lot of __init__ methods that simply called their super()
with nothing else.

Change-Id: I6771912adf81f145d09f950c57d219bd77789822

12 years agoMerge "Make autoscale not dependent on loadbalancer impl."
Jenkins [Thu, 6 Jun 2013 12:59:22 +0000 (12:59 +0000)]
Merge "Make autoscale not dependent on loadbalancer impl."

12 years agoMerge "Rename functions which should not be run as tests."
Jenkins [Thu, 6 Jun 2013 09:37:18 +0000 (09:37 +0000)]
Merge "Rename functions which should not be run as tests."

12 years agoMerge "Fix instance creation when a network with no subnet is used"
Jenkins [Thu, 6 Jun 2013 09:07:04 +0000 (09:07 +0000)]
Merge "Fix instance creation when a network with no subnet is used"

12 years agoMerge "flake8 F812 list comprehension redefines fix."
Jenkins [Thu, 6 Jun 2013 08:46:56 +0000 (08:46 +0000)]
Merge "flake8 F812 list comprehension redefines fix."

12 years agoRename functions which should not be run as tests.
Steve Baker [Thu, 6 Jun 2013 03:34:45 +0000 (15:34 +1200)]
Rename functions which should not be run as tests.

These function names confuse some test runners which results in them
incorrectly being run as tests.

Change-Id: I0780c7d6dcea5019771b42fa5ffb2ebe215c1e20

12 years agoflake8 F812 list comprehension redefines fix.
Steve Baker [Thu, 6 Jun 2013 03:30:40 +0000 (15:30 +1200)]
flake8 F812 list comprehension redefines fix.

This warning is given from the following version of flake8
2.0 (pep8: 1.4.5, mccabe: 0.2.1, pyflakes: 0.6.1)

Change-Id: Ic2ac3be2b76aa2d9e8d0f306d1579b195a998b68

12 years agoOnly call FnGetAtt if resource is in acceptable state.
Steve Baker [Tue, 4 Jun 2013 04:40:12 +0000 (16:40 +1200)]
Only call FnGetAtt if resource is in acceptable state.

This will give resource type authors some certainty on what error
checking their FnGetAtt methods will require.

Fixes bug: #1184794

Change-Id: Iec456075c14cd609cf9607f07bce23e4c6b33c0c

12 years agoMake Fn::GetAtt add a dependency
Zane Bitter [Fri, 31 May 2013 10:52:30 +0000 (12:52 +0200)]
Make Fn::GetAtt add a dependency

This will ensure that resources which get attributes from other resources
are not created until the latter resources are available.

An audit of all the templates in the heat-templates repo revealed that in
only one case did this cause a circular reference, and it was the template
that appeared to be incorrect (it has since been fixed).

Change-Id: Ibd51acdda55c24f665c5ca887040f3564d952c0e

12 years agoUse - instead of . for physical_resource_name delim.
Steve Baker [Wed, 5 Jun 2013 21:41:44 +0000 (09:41 +1200)]
Use - instead of . for physical_resource_name delim.

Avoiding using . means that instance hostnames are unique within the stack
(and within the tenant).

This solves 2 real-world use cases:
- tripleo issue, as described in bug: #1184713
- OpenShift template resorts to setting the hostname to ec2_instance_id

This may have an impact on users who are scripting to assume . delimiting,
however this will only affect newly created stacks after this change is
deployed.

Fixes bug: #1184713

Change-Id: I5a8eb358ea9c52162eb9263b9f9e6dcf750d787b

12 years agoMake autoscale not dependent on loadbalancer impl.
Andrew Plunk [Wed, 5 Jun 2013 19:54:41 +0000 (14:54 -0500)]
Make autoscale not dependent on loadbalancer impl.

Autoscale was calling reload on a resource, which is not part of the
resource interface. Autoscale has been modified to use update.

Change-Id: Ifb17c9def7e560d96e26308db67b4ee3f93a2b9f

12 years agoUse a physical name matching class in unit tests
Zane Bitter [Wed, 5 Jun 2013 08:15:56 +0000 (10:15 +0200)]
Use a physical name matching class in unit tests

This gives us the flexibility to change the format of the physical resource
name.

Change-Id: Ie36453345149291fe04d89b52d7966816e03cda6

12 years agoMerge "Add Fn::Select template function"
Jenkins [Wed, 5 Jun 2013 04:20:58 +0000 (04:20 +0000)]
Merge "Add Fn::Select template function"

12 years agoMerge "For Fn::Join, replace None items with an empty string."
Jenkins [Wed, 5 Jun 2013 02:20:41 +0000 (02:20 +0000)]
Merge "For Fn::Join, replace None items with an empty string."

12 years agoAdd Fn::Select template function
Angus Salkeld [Tue, 4 Jun 2013 23:37:19 +0000 (09:37 +1000)]
Add Fn::Select template function

It also knows how to lookup keys in dict's too.
The strings can be a serialized json blob too.

blueprint fn-select
blueprint fn-mapselect
Change-Id: Ie40afa47c1f0a699abb852bc22388f3f675172e6

12 years agoFix instance creation when a network with no subnet is used
Simon Pasquier [Tue, 4 Jun 2013 14:42:50 +0000 (16:42 +0200)]
Fix instance creation when a network with no subnet is used

It is possible with OpenStack Networking to create a network with no
subnet attached to it.
When creating an instance associated to such a network, the engine would
raise a 'list index out of range' exception because the instance has no
IP address on the network.
The issue would also happen with a loadbalancer referencing the same
type of instance.

Change-Id: I6122efb90877d8020added44aee8802eb8a80297
Fixes: bug #1187023
12 years agoMerge "Relax lxml version requirements."
Jenkins [Tue, 4 Jun 2013 09:35:43 +0000 (09:35 +0000)]
Merge "Relax lxml version requirements."

12 years agoFor Fn::Join, replace None items with an empty string.
Steve Baker [Tue, 4 Jun 2013 05:25:42 +0000 (17:25 +1200)]
For Fn::Join, replace None items with an empty string.

Currently, attempts to join lists with None items results in an error.

This change is required for the next attempt to fix bug: #1184794

Change-Id: Ib599eeb21b7325ff797768100f1556a424a8bde9

12 years agoRelax lxml version requirements.
Steve Baker [Tue, 4 Jun 2013 02:45:59 +0000 (14:45 +1200)]
Relax lxml version requirements.

This was preventing devstack from starting on Fedora 18 due to the
package python-lxml-3.2.1-1.fc18.x86_64 being too new.

This change is aligns the lxml rule with the requirements project.

Change-Id: Idd3697596dcefb830d60f8e44171b8c50e78178a

12 years agotests : fix cut/paste test name shadowing
Steven Hardy [Mon, 3 Jun 2013 22:57:33 +0000 (23:57 +0100)]
tests : fix cut/paste test name shadowing

Fix test class duplication

Change-Id: I4ff21b60ad6c70d8d4563db54c9afd83f59d6957

12 years agoMerge "Handle metadata updates during stack creation"
Jenkins [Mon, 3 Jun 2013 18:31:11 +0000 (18:31 +0000)]
Merge "Handle metadata updates during stack creation"

12 years agoMerge "Log at DEBUG level in unit tests"
Jenkins [Mon, 3 Jun 2013 08:23:51 +0000 (08:23 +0000)]
Merge "Log at DEBUG level in unit tests"

12 years agoMerge "Fix Hacking H304 Warnings"
Jenkins [Mon, 3 Jun 2013 01:54:30 +0000 (01:54 +0000)]
Merge "Fix Hacking H304 Warnings"

12 years agoMerge "a minor fix to volume.py"
Jenkins [Mon, 3 Jun 2013 01:54:08 +0000 (01:54 +0000)]
Merge "a minor fix to volume.py"

12 years agoa minor fix to volume.py
Liang Chen [Fri, 31 May 2013 09:41:30 +0000 (17:41 +0800)]
a minor fix to volume.py

There seems a typo with the exception name and the comment.

Change-Id: I5c0abe48c81a69e4b879b080236899031bb40e97

12 years agoFix Hacking H304 Warnings
Dirk Mueller [Sat, 1 Jun 2013 13:39:46 +0000 (15:39 +0200)]
Fix Hacking H304 Warnings

And also enable it permanently.

Change-Id: Iae319ecaee86049bc25330e25c4f672e3b158851

12 years agoFix an intermitting failure in test_metadata_refresh
Thomas Herve [Fri, 31 May 2013 21:19:56 +0000 (14:19 -0700)]
Fix an intermitting failure in test_metadata_refresh

Given that resource creation can happen in parallel, the call to
check_create_complete may not follow the call to handle_create, so mock
those without checking the order.

Change-Id: Icf40f7339dc4c6e885c4a42f3a2c3f546f14c08d

12 years agoLog at DEBUG level in unit tests
Zane Bitter [Fri, 31 May 2013 20:18:36 +0000 (22:18 +0200)]
Log at DEBUG level in unit tests

By default, only INFO and higher severities were logged.

Change-Id: I5791cd163a54224b798bcc2987ac792b3b7b4030

12 years agoscheduler: Fix inifinite loop for no-wait tasks
Zane Bitter [Fri, 31 May 2013 19:34:36 +0000 (21:34 +0200)]
scheduler: Fix inifinite loop for no-wait tasks

When a task run by a DependencyTaskGroup completed immediately (i.e. it
was marked as done right after calling start()), the corresponding entry in
the dependency graph was never removed. As a result the DependencyTaskGroup
would continue running forever (or until it timed out).

Fixes bug #1186389

Change-Id: I9715b54a61d1c3adc22403bc39f8673306bffead

12 years agoMerge "add error flow tests for volume detach"
Jenkins [Fri, 31 May 2013 13:34:12 +0000 (13:34 +0000)]
Merge "add error flow tests for volume detach"

12 years agoMerge "Clarify a comment which says we require KeyName - which is incorrect"
Jenkins [Fri, 31 May 2013 13:32:58 +0000 (13:32 +0000)]
Merge "Clarify a comment which says we require KeyName - which is incorrect"

12 years agoHandle metadata updates during stack creation
Zane Bitter [Fri, 31 May 2013 10:52:30 +0000 (12:52 +0200)]
Handle metadata updates during stack creation

Don't try to recalculate the metadata on an instance that hasn't yet been
stored in the database.

Fixes bug #1185530

Change-Id: I39f2733e2ba4730ea05a4a50962cb30f044ef752

12 years agoCreate nested stacks in parallel
Zane Bitter [Fri, 31 May 2013 10:39:08 +0000 (12:39 +0200)]
Create nested stacks in parallel

Use check_create_complete() to advance the nested stack creation, so that
it can occur in parallel with other resources in the parent stack.

Implements blueprint concurrent-resource-scheduling

Change-Id: I841b4c93b257409eecd0d2a43b35d9bee114ab87

12 years agoCreate stacks with a co-routine
Zane Bitter [Fri, 31 May 2013 10:39:08 +0000 (12:39 +0200)]
Create stacks with a co-routine

This will allow nested stacks to be created in parallel with other stack
resources in the future.

Change-Id: If1817bddcea50fdd7b640dee5b5d12257aada651

12 years agoImplement timeouts for nested stacks
Zane Bitter [Fri, 31 May 2013 10:39:08 +0000 (12:39 +0200)]
Implement timeouts for nested stacks

This also means that if no default is specified, nested stacks will not
time out (previously they used the default timeout of 60 minutes). Of
course, like other resources, creation of the nested stack will stop if and
when the parent stack times out.

Change-Id: Ibd55c32d63e971f79319ed40321fa4be52b65419

12 years agoAllow stacks to be created without a timeout
Zane Bitter [Fri, 31 May 2013 10:39:08 +0000 (12:39 +0200)]
Allow stacks to be created without a timeout

This should be the default for nested stacks, rather than the default
timeout of 60 minutes for stacks created through the API.

Change-Id: Iacee6eaf8f345e506b417e776f696db6b11bbf20

12 years agoadd error flow tests for volume detach
Liang Chen [Fri, 31 May 2013 02:56:18 +0000 (10:56 +0800)]
add error flow tests for volume detach

engine.resources.volume.VolumeAttachment lacks tests for some
exception flows

Fixes bug #1183239

Change-Id: I3d84fadb1ff60c622fbfbd634e003aaab382b405

12 years agoClarify a comment which says we require KeyName - which is incorrect
Steven Dake [Fri, 31 May 2013 00:37:41 +0000 (17:37 -0700)]
Clarify a comment which says we require KeyName - which is incorrect

The Nova create API requires a name, image, and flavor.  The key_name
is not mandatory.  Possibly in AWS InstanceType (flavor) is not
mandatory but it is with Nova.

blueprint native-nova-instance

Change-Id: I6f5a77d7999ea4d8e91402ae215179b982a947f6

12 years agoMerge "Add a separate Template class for the HOT format"
Jenkins [Thu, 30 May 2013 10:23:07 +0000 (10:23 +0000)]
Merge "Add a separate Template class for the HOT format"

12 years agoMerge "Clean up DB migrations when running unit tests"
Jenkins [Thu, 30 May 2013 06:38:40 +0000 (06:38 +0000)]
Merge "Clean up DB migrations when running unit tests"

12 years agoAdd CONTRIBUTING.rst file.
Monty Taylor [Thu, 16 May 2013 16:28:24 +0000 (09:28 -0700)]
Add CONTRIBUTING.rst file.

We don't use github pull requests, but we'd like to make that clear
to people if they show up at github and try to do one. github will
display the content of this file on the pull request submit form
if it's there.

Change-Id: I25e5b65b02244e100da4e5717ded09fcc0f33741

12 years agoClean up DB migrations when running unit tests
Zane Bitter [Wed, 29 May 2013 07:25:30 +0000 (09:25 +0200)]
Clean up DB migrations when running unit tests

When doing development work, all kinds of issue can result when moving
between versions of the code that have added/removed DB migration scripts
if the compiled .pyc files are left behind. To save the need to do this
manually, remove all of the .pyc files when the unit tests are run.

Change-Id: Ia4bc889edeeed499e5fc2172d5f7c1b4e693a27b

12 years agoGet rid of extra delays in unit tests
Zane Bitter [Wed, 29 May 2013 07:25:30 +0000 (09:25 +0200)]
Get rid of extra delays in unit tests

Some resource types will now have at least one sleep during their creation
where previously they did not, so unit tests need to stub out the sleep if
they were not already doing so.

Change-Id: I1ae919263c6f12d9219970f226019e53daff052b

12 years agoRestore heat.db.sync and add Deprecated message.
Clint Byrum [Wed, 29 May 2013 01:29:37 +0000 (18:29 -0700)]
Restore heat.db.sync and add Deprecated message.

This unpythonic deprecation method is used because this module was only
ever meant to be used from the CLI as 'python -m heat.db.sync'. The
module should be removable in Havana+1.

Fixes bug #1185220

Change-Id: I9943e5c35d9578f899fae1d11b818a2a5a9167c0

12 years agoMerge "Create resources in parallel where possible"
Jenkins [Tue, 28 May 2013 18:12:19 +0000 (18:12 +0000)]
Merge "Create resources in parallel where possible"

12 years agoMerge "Add a dependency-aware task group"
Jenkins [Tue, 28 May 2013 18:12:15 +0000 (18:12 +0000)]
Merge "Add a dependency-aware task group"

12 years agoMerge "Move deletion from dependency graph to __delitem__"
Jenkins [Tue, 28 May 2013 18:12:09 +0000 (18:12 +0000)]
Merge "Move deletion from dependency graph to __delitem__"

12 years agoMerge "Make the mutable dependency graph a separate class"
Jenkins [Tue, 28 May 2013 18:12:06 +0000 (18:12 +0000)]
Merge "Make the mutable dependency graph a separate class"

12 years agoMerge "Make dependency graph node class public"
Jenkins [Tue, 28 May 2013 18:12:02 +0000 (18:12 +0000)]
Merge "Make dependency graph node class public"

12 years agoUse heat-engine.conf for heat-manage config
Derek Higgins [Tue, 28 May 2013 09:47:43 +0000 (10:47 +0100)]
Use heat-engine.conf for heat-manage config

Fixes bug 1184923

because prog was missing the CONF object was looking for
the config file in /etc/heat/heat.conf  this should have
been /etc/heat/heat-engine.conf

Change-Id: Ie23b9998df368274d69180e0d619b042dd9dc053

12 years agoCreate resources in parallel where possible
Zane Bitter [Tue, 28 May 2013 08:16:37 +0000 (10:16 +0200)]
Create resources in parallel where possible

Use the create co-routines with a DependencyTaskGroup to create resources
in parallel where possible, subject to their dependencies.

This implements blueprint concurrent-resource-scheduling with the exception
of nested stacks.

Change-Id: I4789ab11617b408622d8fc083e6b80a797d99e3a

12 years agoAdd a dependency-aware task group
Zane Bitter [Tue, 28 May 2013 08:16:37 +0000 (10:16 +0200)]
Add a dependency-aware task group

Change-Id: I4524b4b220bdc02bdd7e3f9a5d84b1982cbee99f

12 years agoMove deletion from dependency graph to __delitem__
Zane Bitter [Tue, 28 May 2013 08:16:37 +0000 (10:16 +0200)]
Move deletion from dependency graph to __delitem__

Graph objects are mutable, and will in future be used for operations other
than a topological sort, so abstract out the code for deleting backlinks to
a node from the other nodes that have dependencies on it when it is
removed.

Change-Id: I86b81303ed2dffd969a2db10535761f108f4808a

12 years agoMake the mutable dependency graph a separate class
Zane Bitter [Tue, 28 May 2013 08:16:37 +0000 (10:16 +0200)]
Make the mutable dependency graph a separate class

Rather than copying dictionaries internally, provide a separate Graph class
that can be copied externally as well.

Change-Id: Id0bd55944369da59d7da1713369fce0d73ffe814

12 years agoMake dependency graph node class public
Zane Bitter [Tue, 28 May 2013 08:16:37 +0000 (10:16 +0200)]
Make dependency graph node class public

We're going to start making more use of it, so there's no point hiding it
away inside the Dependencies class.

Change-Id: I10c4a05493697f8834623cd798ef35161a0c219b

12 years agoFix the handling of non-existing paste file
Angus Salkeld [Tue, 28 May 2013 02:06:28 +0000 (12:06 +1000)]
Fix the handling of non-existing paste file

First only call find_file() by it's self so we can check for None
(abspath crashes if you pass it None)
We are already calling abspath at the return, so this
also prevents a double call to abspath.

If return None from _get_deployment_config_file() load_paste_app() will
print out a nice error message.

Change-Id: I451e090b7f08266ca824b5da228dafde55726d94

12 years agoMerge "Add a basic heat-manage"
Jenkins [Tue, 28 May 2013 00:37:22 +0000 (00:37 +0000)]
Merge "Add a basic heat-manage"