]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
12 years agoMerge "Switch to oslo.config"
Jenkins [Wed, 6 Mar 2013 23:24:43 +0000 (23:24 +0000)]
Merge "Switch to oslo.config"

12 years agoMerge "make parsed template snapshots before updating"
Jenkins [Wed, 6 Mar 2013 22:21:49 +0000 (22:21 +0000)]
Merge "make parsed template snapshots before updating"

12 years agoSwitch to oslo.config
Mark McLoughlin [Wed, 6 Mar 2013 20:21:29 +0000 (20:21 +0000)]
Switch to oslo.config

The oslo-config package has been renamed. Switch to the new
version.

Change-Id: I6a0fa803b0076bc5338c996e21bbcef54e1d75cd

12 years agoheat engine : watchrule quietly discard unused metric data
Steven Hardy [Wed, 6 Mar 2013 14:55:12 +0000 (14:55 +0000)]
heat engine : watchrule quietly discard unused metric data

Some cfn-push-stats options try to send multiple metrics to a
watch, which won't work with our simplified CW implementation
which expects exactly one Metric associated with each watch
(since that's all you can define via the template)
So quietly discard any metric data we aren't interested in.

ref bug 1133510

Change-Id: I5159611b96c501ff2d8e6e605cbd3d4ae5f77e48

12 years agoheat engine : Loadbalancer template watch reference should be Ref
Steven Hardy [Wed, 6 Mar 2013 14:14:53 +0000 (14:14 +0000)]
heat engine : Loadbalancer template watch reference should be Ref

Replace hard-coded reference to latency_watcher with Ref, otherwise
the name is not fully qualified for the nested stack and the engine
fails to lookup the watchrule

ref bug 1133510

Change-Id: If0352726ee89e2c8b78beb9436be36b811f1e1cd

12 years agomake parsed template snapshots before updating
Angus Salkeld [Wed, 6 Mar 2013 05:28:00 +0000 (16:28 +1100)]
make parsed template snapshots before updating

This is to make sure that as the update progresses and dependant
resources are modified/replaced that we compare the original
dynamic data with the current.

bug 1134258
Change-Id: Ia4e474e914aa9e99e5e569c4f2276beb55798421

12 years agoMerge "heat engine : Ensure properties validation is caught"
Jenkins [Wed, 6 Mar 2013 11:48:26 +0000 (11:48 +0000)]
Merge "heat engine : Ensure properties validation is caught"

12 years agoMerge "Test coverage for NestedStack, and fix FnGetRefId"
Jenkins [Wed, 6 Mar 2013 11:40:43 +0000 (11:40 +0000)]
Merge "Test coverage for NestedStack, and fix FnGetRefId"

12 years agoheat engine : Ensure properties validation is caught
Steven Hardy [Tue, 5 Mar 2013 15:16:59 +0000 (15:16 +0000)]
heat engine : Ensure properties validation is caught

Rework usage of properties.validate() so that we always
catch the error and set the resource state to failed when
a properties validation error occurs

fixes bug 1146529

Change-Id: I4c5b24cc29a19a5170852aa7626031f9612b3272

12 years agoMerge "When updating the metadata load the stack with the stored context"
Jenkins [Wed, 6 Mar 2013 01:52:47 +0000 (01:52 +0000)]
Merge "When updating the metadata load the stack with the stored context"

12 years agoTest coverage for NestedStack, and fix FnGetRefId
Steve Baker [Wed, 6 Mar 2013 00:28:22 +0000 (13:28 +1300)]
Test coverage for NestedStack, and fix FnGetRefId

NestedStack now has 100% coverage. resource_id is now set during create
instead of evaluated during FnGetRefId

Fixes: Bug #1131534
Change-Id: I21966acc711a801d28a8a22c377758d2363dd096

12 years agoWhen updating the metadata load the stack with the stored context
Angus Salkeld [Tue, 5 Mar 2013 22:45:56 +0000 (09:45 +1100)]
When updating the metadata load the stack with the stored context

bug 1144996
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Change-Id: I2b0547f4867f19f8319e2c4b79ac325ae8cd6bd8

12 years agoadd missing licence header
Steven Hardy [Tue, 5 Mar 2013 11:57:44 +0000 (11:57 +0000)]
add missing licence header

Change-Id: I95d883c7c58ecba925bc6fa41d7a9491b18a55fa

12 years agoStop heat services from logging to stderr by default
Steven Dake [Tue, 5 Mar 2013 16:01:56 +0000 (09:01 -0700)]
Stop heat services from logging to stderr by default

Change the configuration files to set use_stderr to False by
default.  Oslo's log sets use_stderr to True by default, and
the only reasonable way to override is via the config files.

Change-Id: Ibc4ac3b8cb5d7478260d5d014eb48860bae4bc0b
Fixes: Bug #1146848
12 years agoMerge "Make sure we have a volumes property before trying to use it"
Jenkins [Tue, 5 Mar 2013 15:10:23 +0000 (15:10 +0000)]
Merge "Make sure we have a volumes property before trying to use it"

12 years agoMake sure we have a volumes property before trying to use it
Angus Salkeld [Tue, 5 Mar 2013 12:44:54 +0000 (23:44 +1100)]
Make sure we have a volumes property before trying to use it

bug 1146742
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Change-Id: I2d56af0b07f544642e0527a8300db842d2bc0268

12 years agoPrevent shadowing of the "context" module/parameter
Angus Salkeld [Tue, 5 Mar 2013 11:46:06 +0000 (22:46 +1100)]
Prevent shadowing of the "context" module/parameter

Keep the module name true.
part of bug 1144996

Change-Id: Idb8c5a8190bbb7f81d70c1a95bf5352791f87693
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agoFail validation when an unknown property is supplied in a template.
Angus Salkeld [Tue, 5 Mar 2013 11:17:12 +0000 (22:17 +1100)]
Fail validation when an unknown property is supplied in a template.

bug #1101098
Change-Id: I9430ad859e9a93d6c0d2a417877e02c151e98a05

12 years agoMerge "Validation failures now raise StackValidationFailed"
Jenkins [Tue, 5 Mar 2013 08:47:38 +0000 (08:47 +0000)]
Merge "Validation failures now raise StackValidationFailed"

12 years agoMerge "vpc_test: move DependsOn to the correct template section"
Jenkins [Tue, 5 Mar 2013 02:09:00 +0000 (02:09 +0000)]
Merge "vpc_test: move DependsOn to the correct template section"

12 years agoValidation failures now raise StackValidationFailed
Steve Baker [Fri, 8 Feb 2013 01:54:57 +0000 (14:54 +1300)]
Validation failures now raise StackValidationFailed

This changes the way validation failures are presented
to heat-cfn as per bug 1072939

Change-Id: Iddaaf0c83c5d0df7c0143c6805096a83f8e5dc51

12 years agoMerge "Add N802 rule to hacking.py"
Jenkins [Tue, 5 Mar 2013 01:43:51 +0000 (01:43 +0000)]
Merge "Add N802 rule to hacking.py"

12 years agoMerge "Create autoscaling instances in parallel"
Jenkins [Tue, 5 Mar 2013 01:40:02 +0000 (01:40 +0000)]
Merge "Create autoscaling instances in parallel"

12 years agoMerge "Separate public/private autoscaling adjust() APIs"
Jenkins [Tue, 5 Mar 2013 01:39:55 +0000 (01:39 +0000)]
Merge "Separate public/private autoscaling adjust() APIs"

12 years agoMerge "Move instance polling into check_active()"
Jenkins [Tue, 5 Mar 2013 01:36:15 +0000 (01:36 +0000)]
Merge "Move instance polling into check_active()"

12 years agoMerge "Use oslo logging setup."
Jenkins [Tue, 5 Mar 2013 01:16:01 +0000 (01:16 +0000)]
Merge "Use oslo logging setup."

12 years agovpc_test: move DependsOn to the correct template section
Angus Salkeld [Tue, 5 Mar 2013 00:49:12 +0000 (11:49 +1100)]
vpc_test: move DependsOn to the correct template section

found when fixing bug #1101098
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Change-Id: I7591111bcdf768119d265d0a9c901a0e189604d3

12 years agoheat clients : Make heat-boto rollback disabled by default
Steven Hardy [Mon, 4 Mar 2013 15:29:36 +0000 (15:29 +0000)]
heat clients : Make heat-boto rollback disabled by default

The boto library always sends the DisableRollback parameter,
defaulted to False, which is the opposite of the engine
default now, so we have to set DisableRollback to True in
the boto client wrapper

ref bug 1131303

Change-Id: I4acbba7b37f24cb1a874292ff2323ae24b630edf

12 years agoheat clients : Change --disable-rollback to --enable-rollback
Steven Hardy [Mon, 4 Mar 2013 15:27:57 +0000 (15:27 +0000)]
heat clients : Change --disable-rollback to --enable-rollback

Since the engine default is now rollback disabled, flip this
switch so the user can opt-in to rollback functionality via
the --enable-rollback cli option to heat-cfn/heat-boto

ref bug 1131303

Change-Id: I3965de9a2beb510d5623d0c7cd8ff3aea9d4364a

12 years agoheat engine : Disable stack rollback by default
Steven Hardy [Mon, 4 Mar 2013 11:57:56 +0000 (11:57 +0000)]
heat engine : Disable stack rollback by default

Until the event-persistence BP is implemented, we should
disable stack rollback by default and make it opt-in.

fixes bug 1131303

Change-Id: I101e108c3959c4b7b4cfc68449ba2b989b157626

12 years agoAdd N802 rule to hacking.py
Steven Dake [Thu, 28 Feb 2013 21:42:00 +0000 (14:42 -0700)]
Add N802 rule to hacking.py

Gate on commit headers < 50 characters

Change-Id: Ia6a616d8a9b0eabca05a23476e284f261108b43a
Fixes: Bug #1136386
12 years agoAdd pyflakes to test-requires
Steven Dake [Fri, 1 Mar 2013 00:02:11 +0000 (17:02 -0700)]
Add pyflakes to test-requires

pyflakes needs to be installed in the venv

Change-Id: Ie7aada13da4e191108363c80daf719212d06d316
Fixes: Bug #1131275
12 years agoRemove unused import from test_nokey.py
Steven Dake [Mon, 4 Mar 2013 17:16:16 +0000 (10:16 -0700)]
Remove unused import from test_nokey.py

test_nokey.py was recently merged into the source tree with an
unused import (copy.py).

Change-Id: I27b7040b5719ea21d1e0a79afe499bf7fa5a94e5
Fixes: Bug #1131275
12 years agoCreate autoscaling instances in parallel
Zane Bitter [Mon, 4 Mar 2013 10:31:27 +0000 (11:31 +0100)]
Create autoscaling instances in parallel

Fixes bug #1136148

Change-Id: I02ea52df85c4ed7f0f16abcfd1ab24b35168a787
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoSeparate public/private autoscaling adjust() APIs
Zane Bitter [Mon, 4 Mar 2013 10:31:27 +0000 (11:31 +0100)]
Separate public/private autoscaling adjust() APIs

Internal uses of adjust() have slightly different needs.

Change-Id: Ibb85425f08b7b2d78be2d9ef5c8a9f464b7eead1
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMove instance polling into check_active()
Zane Bitter [Mon, 4 Mar 2013 10:31:27 +0000 (11:31 +0100)]
Move instance polling into check_active()

Don't poll for the instance status in handle_create(). Allow
Resource.create() to poll the resource using check_active().

Change-Id: I13a8fefcef6594d014e7e5a3131f9342521e367d
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoUse oslo logging setup.
Angus Salkeld [Mon, 4 Mar 2013 06:00:47 +0000 (17:00 +1100)]
Use oslo logging setup.

The one reason we kept our own version was because of the qpid
logging that is quite useful. But this is now easily done via
the "default_log_levels" option.

I have setup the api servers with:
 ampqlib,qpid.messaging,keystone,eventlet
and the engine with:
 ampqlib,qpid.messaging,keystone,eventlet,sqlalchemy

bug: 1143629
Change-Id: I04eeab469ab59da550e08188d53b2cfbb576c04d
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agoMerge "Add breaks to for loops"
Jenkins [Sun, 3 Mar 2013 20:25:43 +0000 (20:25 +0000)]
Merge "Add breaks to for loops"

12 years agoSplit resource create into create and check_active
Zane Bitter [Fri, 1 Mar 2013 16:12:54 +0000 (17:12 +0100)]
Split resource create into create and check_active

Change-Id: Ib8206f204e8805936defaa3431ecdf34b161e724
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoFix unit tests for Instance IP
Zane Bitter [Fri, 1 Mar 2013 16:12:54 +0000 (17:12 +0100)]
Fix unit tests for Instance IP

Don't try to test the IP addresses after the instance has been deleted.

Ref bug #1091497

Change-Id: I566c26a4707edc9d210bd422dcff8fbbcc2236d5
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMerge "Remove unused import from loguserdata.py"
Jenkins [Fri, 1 Mar 2013 16:12:22 +0000 (16:12 +0000)]
Merge "Remove unused import from loguserdata.py"

12 years agoMerge "Fix Unrecognized Attribute admin_state_up Error"
Jenkins [Fri, 1 Mar 2013 16:11:06 +0000 (16:11 +0000)]
Merge "Fix Unrecognized Attribute admin_state_up Error"

12 years agoFix flaky unit test
Zane Bitter [Fri, 1 Mar 2013 14:24:19 +0000 (15:24 +0100)]
Fix flaky unit test

This was failing intermittently during the gate tests because there was no
dependency in the template for the Instance on the WaitConditionHandle, nor
for the WaitCondition on the Instance, so the order in which resources
would be created was somewhat random.

This patch fixes the test template, and tests updating the metadata should
occur *during* creation of the stack, as well after, to replicate a real
wait condition (which won't finish creation until the metadata update
occurs).

Change-Id: I26b5590a9ee90d205bd9f2e31bcb74e68065ac25
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMerge "Allow heat to be used without a KeyName set."
Jenkins [Fri, 1 Mar 2013 10:49:01 +0000 (10:49 +0000)]
Merge "Allow heat to be used without a KeyName set."

12 years agoFix Unrecognized Attribute admin_state_up Error
jiangwt100 [Thu, 28 Feb 2013 09:48:00 +0000 (17:48 +0800)]
Fix Unrecognized Attribute admin_state_up Error

Bug #1135485
screen-h-eng
Error message: {"QuantumError": "Unrecognized attribute(s) 'admin_state_up'"}

Change-Id: I4668b0603e0deab85e416d9cec5617f17eaa2aea

12 years agoAdd breaks to for loops
Ian Main [Fri, 1 Mar 2013 02:03:26 +0000 (18:03 -0800)]
Add breaks to for loops

This just adds breaks to a couple of matching for loops in instance.py.

Fixes: bug #1130898
Change-Id: Iacfa040ba3a400b506e4fbc63c513eb3e67ecb11

12 years agoRemove unused import from loguserdata.py
Steven Dake [Fri, 1 Mar 2013 00:15:26 +0000 (17:15 -0700)]
Remove unused import from loguserdata.py

Change-Id: I0bdf8a51e0d21533c5ce8148cdffcbc92f89fef9
Fixes: Bug #1131275
12 years agoAllow heat to be used without a KeyName set.
Ian Main [Mon, 18 Feb 2013 19:20:20 +0000 (11:20 -0800)]
Allow heat to be used without a KeyName set.

This patch lets you start an instance without setting the KeyName, which
I gather is allowed in ec2 as well.

This revision adds a template and test.

Fixes: bug #1129394
Change-Id: I667f373b73479caa506ee49d8d1615ff4aad47ed
Signed-off-by: Ian Main <imain@redhat.com>
12 years agoDo a metadata refresh after an explicit metadata write.
Angus Salkeld [Thu, 28 Feb 2013 22:40:59 +0000 (09:40 +1100)]
Do a metadata refresh after an explicit metadata write.

if we have a template with (logically) the following:
instance2:
   metadata
     GetAtt waitcond.data

waitcond:

when the waitcond is fired, it updates the metadata but it needs a call
to update the references in "instance2's" metadata.

bug #1135229
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Change-Id: I1a6af9112ba100b17075063f59165b448d6a11f4

12 years agoMerge "Make the exception string a little more useful"
Jenkins [Thu, 28 Feb 2013 20:55:38 +0000 (20:55 +0000)]
Merge "Make the exception string a little more useful"

12 years agoGate on certain pyflakes failures
Steven Dake [Wed, 27 Feb 2013 22:23:48 +0000 (15:23 -0700)]
Gate on certain pyflakes failures

To prevent recent gating problems from typos, an
import not used and redefinition of function problems in
the source code have become gating.

Fixes: Bug #1131275
Change-Id: I7011f3ac5940afc70c38758e67a2222a66e625c3
Signed-off-by: Steven Dake <sdake@redhat.com>
12 years agoRemove unused imports from repo in preperation for pyflakes
Steven Dake [Wed, 27 Feb 2013 18:00:32 +0000 (11:00 -0700)]
Remove unused imports from repo in preperation for pyflakes

Lots of unused imports

Fixes: Bug #1131275
Change-Id: Iacb1d02173b0ec0e0dc81aff84ca6e29e60e2934
Signed-off-by: Steven Dake <sdake@redhat.com>
12 years agoAdd heat-watch to pep8 checks
Steven Dake [Wed, 27 Feb 2013 17:39:54 +0000 (10:39 -0700)]
Add heat-watch to pep8 checks

heat-watch was missing from pep8 checks in the past.  Tidy up heat-watch
and add to run_pep8.sh.

Change-Id: I36680b24ee90a5daeb7f8d7418b665a215026325
Fixes: Bug #1131275
12 years agoUpdate infrastructure to more closely match other OpenStack projects
Steven Dake [Wed, 27 Feb 2013 17:26:46 +0000 (10:26 -0700)]
Update infrastructure to more closely match other OpenStack projects

This patch imports nova's HACKING.rst guidelines altered for Heat.
This patch imports nova's run_pep8.sh with some minor alterations.
This patch imports nova's hacking.py extensions to pep8.

This patch places the run_pep8 logic in a separate file rather than
having it spread between tox.ini and run_tests.sh.  The HACKING.rst
requirements as well as general pep8 requirements are then enforced
with run_pep8.sh.

Avoid running once the N802 rule until dependency changelogs are
less then 50 characters.

Change-Id: If46c14668eae3cf11b8fbff46d766cc589d701aa
Fixes: Bug #1131275
12 years agoMerge "heat clients : make boto client library pass disable_rollback"
Jenkins [Thu, 28 Feb 2013 19:34:29 +0000 (19:34 +0000)]
Merge "heat clients : make boto client library pass disable_rollback"

12 years agoMerge "heat engine : fix hardcoded DisableRollback value"
Jenkins [Thu, 28 Feb 2013 19:27:19 +0000 (19:27 +0000)]
Merge "heat engine : fix hardcoded DisableRollback value"

12 years agoheat engine : fix hardcoded DisableRollback value
Steven Hardy [Thu, 28 Feb 2013 16:14:35 +0000 (16:14 +0000)]
heat engine : fix hardcoded DisableRollback value

Engine API should return the real state of rollback now we
implement it, not hard-code to True

fixes bug 1135963

Change-Id: I6b9e6ea9587fe0c84b57f34bf69c2dcec5d5c09f

12 years agoheat clients : make boto client library pass disable_rollback
Steven Hardy [Thu, 28 Feb 2013 16:04:33 +0000 (16:04 +0000)]
heat clients : make boto client library pass disable_rollback

Make the boto_client.py wrapper correctly interpret the DisableRollback
argument, so the --disable-rollback option of heat-boto will work

fixes bug 1131283

Change-Id: If31daa1583ff836fbb3f67799b89602b16f904e3

12 years agoheat tools : openstack script install mysql via openstack-db
Steven Hardy [Thu, 28 Feb 2013 15:13:48 +0000 (15:13 +0000)]
heat tools : openstack script install mysql via openstack-db

Don't install mysql-server in tools/openstack, instead allow
openstack-db to non-interactively install it for us, which means
the root password is set as per the -r password option when
installing on a fresh system with no mysql

NOTE : if testing this on a system which has had mysql installed,
do yum remove mysql-server && rm -fr /var/lib/mysql or the
reinstalled mysql will use the old credentials

fixes bug 1133502

Change-Id: Ie3ba56e5f971e032be4f099e81cbb24afe76dfbc

12 years agoMerge "Removes unused config settings from heat-engine.conf"
Jenkins [Thu, 28 Feb 2013 13:57:46 +0000 (13:57 +0000)]
Merge "Removes unused config settings from heat-engine.conf"

12 years agoMerge "heat engine : loadbalancer resource template, refer to StackId"
Jenkins [Thu, 28 Feb 2013 12:21:43 +0000 (12:21 +0000)]
Merge "heat engine : loadbalancer resource template, refer to StackId"

12 years agoMerge "heat engine : Re-resolve resource static data before create"
Jenkins [Thu, 28 Feb 2013 12:21:01 +0000 (12:21 +0000)]
Merge "heat engine : Re-resolve resource static data before create"

12 years agoMerge "heat engine : Compare runtime resolved resource snippets on update"
Jenkins [Thu, 28 Feb 2013 12:20:34 +0000 (12:20 +0000)]
Merge "heat engine : Compare runtime resolved resource snippets on update"

12 years agoMerge "heat engine : Set stack parameters AWS::StackId on stack create/store"
Jenkins [Thu, 28 Feb 2013 12:05:05 +0000 (12:05 +0000)]
Merge "heat engine : Set stack parameters AWS::StackId on stack create/store"

12 years agoMerge "heat engine : Add parser parameter support for AWS::StackId"
Jenkins [Thu, 28 Feb 2013 12:04:17 +0000 (12:04 +0000)]
Merge "heat engine : Add parser parameter support for AWS::StackId"

12 years agoMerge "Put heat data files in /var/lib/heat-cfntools"
Jenkins [Thu, 28 Feb 2013 02:51:45 +0000 (02:51 +0000)]
Merge "Put heat data files in /var/lib/heat-cfntools"

12 years agoMerge "Remove duplicate Mapper() constructor"
Jenkins [Thu, 28 Feb 2013 01:42:58 +0000 (01:42 +0000)]
Merge "Remove duplicate Mapper() constructor"

12 years agoPut heat data files in /var/lib/heat-cfntools
Steven Dake [Wed, 27 Feb 2013 00:38:30 +0000 (17:38 -0700)]
Put heat data files in /var/lib/heat-cfntools

The /var/lib/heat-cfntools directory should be owned by the
heat-cfntools package for whichever distro it is included.

This avoids the problem of heat writing to directories owned
by cloud-init.

For the moment, the part handler will continue to write to
/var/lib/cloud/data to be removed at a later date.

Change-Id: I70b714c70ed146d4f6807850d6e7264c6a4624cd
Fixes: Bug #1105806
12 years agoDepend on recently released python-quantumclient 2.1.2
Steve Baker [Wed, 27 Feb 2013 21:06:55 +0000 (10:06 +1300)]
Depend on recently released python-quantumclient 2.1.2
Fixes bug 1133381

Change-Id: I9e3f1185e77c8f021a523f201d2191389eb253ef

12 years agoRemove duplicate Mapper() constructor
Angus Salkeld [Wed, 27 Feb 2013 09:22:56 +0000 (20:22 +1100)]
Remove duplicate Mapper() constructor

Change-Id: Ie65fa739dc90515a7170a49c0552b69cdbb7d044
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agoheat engine : loadbalancer resource template, refer to StackId
Steven Hardy [Tue, 26 Feb 2013 14:20:00 +0000 (14:20 +0000)]
heat engine : loadbalancer resource template, refer to StackId

Use the new AWS::StackId pseudo parameter to refer to the stack for
cfn-hup etc, otherwise the stack lookup by name will fail - using
the AWS::StackId parameter means we'll refer to the stack via the
full ARN and the CFN API will be able to lookup the nested stack.

ref bug 1131666

Change-Id: Ieac738df766ae1f1039e743d465cd080b2090473

12 years agoheat engine : Re-resolve resource static data before create
Steven Hardy [Tue, 26 Feb 2013 14:17:00 +0000 (14:17 +0000)]
heat engine : Re-resolve resource static data before create

Re-resolve the template static data before creating the resource,
or we resolve the wrong value for the AWS::StackId pseudo parameter
which is updated after the parser.Stack gets stored.

ref bug 1131666

Change-Id: I68e87366d379356fd7f2685367300abe5594d6f6

12 years agoheat engine : Compare runtime resolved resource snippets on update
Steven Hardy [Tue, 26 Feb 2013 14:55:18 +0000 (14:55 +0000)]
heat engine : Compare runtime resolved resource snippets on update

We need to compare the runtime resolved resource snippet, since that
is what we get back from self.parsed_template.  If we don't do this,
then we get a false positive when a Ref to a parameter which gets
updated (e.g AWS::StackId) is used in the resource properties.

ref bug 1131666

Change-Id: Ib488c43b9eca998a7a82b7571097f5bb69ef946c

12 years agoheat engine : Set stack parameters AWS::StackId on stack create/store
Steven Hardy [Mon, 25 Feb 2013 16:34:13 +0000 (16:34 +0000)]
heat engine : Set stack parameters AWS::StackId on stack create/store

We need to set the ARN provided via the AWS::StackId pseudo parameter
when the stack is stored, and also whenever a parser.Stack object is
created

ref bug 1131666

Change-Id: Ic8dc5ab2b25c85c51f2f685fe69bb2447a1e3615

12 years agoheat engine : Add parser parameter support for AWS::StackId
Steven Hardy [Mon, 25 Feb 2013 14:47:45 +0000 (14:47 +0000)]
heat engine : Add parser parameter support for AWS::StackId

Adds support for the AWS::StackId pseudo parameter, which will
allow us to to reference the stack ARN in the template, e.g so that
stacks can query their resource metadata via ARN not stack name,
which will solve the problem with nested resource being unable
to query their metadata.

ref bug 1131666

Change-Id: Ib7b1d380fa8766b6d0c968bd66270da8ce8245c4

12 years agoRemoves unused config settings from heat-engine.conf
Robert van Leeuwen [Wed, 27 Feb 2013 13:35:52 +0000 (14:35 +0100)]
Removes unused config settings from heat-engine.conf

Change-Id: Ia660009f18eae9d9c22adc5ab36c18f711856bce
Fixes: bug #1134346
12 years agoheat engine : Make loadbalancer nested template raw string
Steven Hardy [Fri, 22 Feb 2013 16:11:00 +0000 (16:11 +0000)]
heat engine : Make loadbalancer nested template raw string

Make the nested template a raw string so we don't need to remember
to double backslash everything

Change-Id: I307db94f8b610f66eafa68f060dcef742a9e1375

12 years agoAdd waitcondition to loadbalancer nested template
Steven Hardy [Mon, 25 Feb 2013 11:19:19 +0000 (11:19 +0000)]
Add waitcondition to loadbalancer nested template

We want to ensure the LB instance has fully launched before declaring
this resource created, otherwise the resource will not be functional
and attempts to modify config via metadata updates will fail

Change-Id: I879c21302f1c3a75a567d959fc2e398c7bfc3f65

12 years agoheat engine : fix variable/import shadowing in service.py
Steven Hardy [Tue, 26 Feb 2013 16:34:28 +0000 (16:34 +0000)]
heat engine : fix variable/import shadowing in service.py

The resources import is shadowed by a variable declaration in
validate template, which is confusing, so add a prefix to
differentiate the variable from the import

bug 1133434

Change-Id: Ia7c451c3a2588ddff114da9897b3bcf58e68cf0c

12 years agoheat engine : reinstate resources import
Steven Hardy [Tue, 26 Feb 2013 16:31:12 +0000 (16:31 +0000)]
heat engine : reinstate resources import

Reinstate the resources import removed by 06f4f85, without this
we fail to create any resources (GenericResource is created for
all resources due to no resource plugins being imported).

bug 1133434

Change-Id: I2b24d58dee83a426deee09f8a9a121f503534de4

12 years agoMerge "Update the metadata if an alarm action makes changes"
Jenkins [Tue, 26 Feb 2013 04:25:41 +0000 (04:25 +0000)]
Merge "Update the metadata if an alarm action makes changes"

12 years agoMerge "Make the alarm actions run in one thread"
Jenkins [Tue, 26 Feb 2013 03:18:26 +0000 (03:18 +0000)]
Merge "Make the alarm actions run in one thread"

12 years agoMerge "Throw a proper error if the flavor is missing."
Jenkins [Mon, 25 Feb 2013 23:44:11 +0000 (23:44 +0000)]
Merge "Throw a proper error if the flavor is missing."

12 years agoUpdate the metadata if an alarm action makes changes
Angus Salkeld [Mon, 25 Feb 2013 00:44:19 +0000 (11:44 +1100)]
Update the metadata if an alarm action makes changes

The point of this change?
- You have another instances' ip in your metadata and if it
  gets restarted you want cfn-hup to see the new ip.

How is it achieved?
- poll for the metadata so you can see these changes (cfn-hup)
- when ever an alarm action is run we make sure the metadata is refreshed.

bug #1131024
Change-Id: I0798c4da9689b126c3c98cafa63138ff2c484ea9

12 years agoMake the alarm actions run in one thread
Angus Salkeld [Mon, 25 Feb 2013 22:16:12 +0000 (09:16 +1100)]
Make the alarm actions run in one thread

bug #1131024
Change-Id: I678d8919a17fc73350ec9061ad2a7234e1d6b9f6

12 years agoMerge "heat : Only set qpid loglevel when rpc_backend specifies qpid"
Jenkins [Mon, 25 Feb 2013 16:09:55 +0000 (16:09 +0000)]
Merge "heat : Only set qpid loglevel when rpc_backend specifies qpid"

12 years agoheat : Only set qpid loglevel when rpc_backend specifies qpid
Steven Hardy [Mon, 25 Feb 2013 10:36:13 +0000 (10:36 +0000)]
heat : Only set qpid loglevel when rpc_backend specifies qpid

fixes bug 1132709

Change-Id: Iefad8be07ab806b17f04ff536af955dc015ee4be

12 years agoUse a short_id for naming S3 containers
Zane Bitter [Fri, 22 Feb 2013 15:05:12 +0000 (16:05 +0100)]
Use a short_id for naming S3 containers

Change-Id: Iba8ea4eb536d58e1332897cec2059aebbb41b28a
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoUse a short_id for naming Swift containers
Zane Bitter [Fri, 22 Feb 2013 15:05:12 +0000 (16:05 +0100)]
Use a short_id for naming Swift containers

Change-Id: Id6ee6b92f05326e3feda3f2b770fff5864e38e19
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoAdd a module for generating random short ID strings
Zane Bitter [Fri, 22 Feb 2013 15:05:12 +0000 (16:05 +0100)]
Add a module for generating random short ID strings

These can be used to ensure uniqueness of names when creating resources in
OpenStack services.

Change-Id: Ifb048fd8ec676b7fd6a15c5d4a39bfc98f0aeca9
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMake the exception string a little more useful
Angus Salkeld [Mon, 25 Feb 2013 00:14:49 +0000 (11:14 +1100)]
Make the exception string a little more useful

This partial helps bug #1119883

Change-Id: I247ab39406bcc608c0d66a8140dc198b93491ac1

12 years agoMerge "Protect AccessKey deletion from failing"
Jenkins [Sun, 24 Feb 2013 22:26:25 +0000 (22:26 +0000)]
Merge "Protect AccessKey deletion from failing"

12 years agoMerge "Remove compat cfg wrapper"
Jenkins [Sun, 24 Feb 2013 22:08:35 +0000 (22:08 +0000)]
Merge "Remove compat cfg wrapper"

12 years agoMerge "Make quantumclient optional again"
Jenkins [Sun, 24 Feb 2013 22:02:40 +0000 (22:02 +0000)]
Merge "Make quantumclient optional again"

12 years agoRemove compat cfg wrapper
Mark McLoughlin [Sat, 23 Feb 2013 09:55:39 +0000 (09:55 +0000)]
Remove compat cfg wrapper

This wrapper was there to allow oslo-config changes through the gate
while keystoneclient hadn't been updated.

Change-Id: I3d48673af58ae379e8e4d2c7fb4b4d81f3ed67dd

12 years agoMerge "Fix tarball tag to be empty rather than a point"
Jenkins [Fri, 22 Feb 2013 17:21:42 +0000 (17:21 +0000)]
Merge "Fix tarball tag to be empty rather than a point"

12 years agoMake quantumclient optional again
Zane Bitter [Fri, 22 Feb 2013 15:05:11 +0000 (16:05 +0100)]
Make quantumclient optional again

Don't crash if quantumclient is not available; just don't register the
resource types that require it.

Change-Id: I9dacc5397327ef7ec784f808227582ee9bd037df
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoGet rid of unused imports
Zane Bitter [Fri, 22 Feb 2013 15:05:11 +0000 (16:05 +0100)]
Get rid of unused imports

Change-Id: I954cf6eb2c326bbeb6bd043b2c11dfe2e01f52d3
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMerge "heat loadbalancer : make LB nested template create credentials"
Jenkins [Fri, 22 Feb 2013 14:28:13 +0000 (14:28 +0000)]
Merge "heat loadbalancer : make LB nested template create credentials"

12 years agoMerge "heat api : allow validation of YAML templates via cfn api"
Jenkins [Fri, 22 Feb 2013 13:11:39 +0000 (13:11 +0000)]
Merge "heat api : allow validation of YAML templates via cfn api"