commit bcaed3f7439fc8c9504f2333f3b253c14d5e32dc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:47:10 2012 +0100

    CFN API: Fix DescribeStackResources with physical ID
    
    DescribeStackResources failed when called with a physical resource ID
    instead of a stack name. Also add a unit test to alert us to any future
    breakage.
    
    Change-Id: I931cd0f74fa225253b06195609ec233ef86353c3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py     |    5 +++-
 heat/tests/test_api_cfn_v1.py |   62 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

commit 244d8a21f887913d19b8b92530767d4695d1e224
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:25:25 2012 +0100

    Handle duplicate physical resources IDs
    
    Because the unit tests create multiple stacks in different tenants with the
    same physical resource ID, the database lookup code must change to
    accomodate this.
    
    This enables us to add a unit test for the describe_stack_resources RPC
    API call for the case where we pass a physical resource ID to lookup.
    
    Change-Id: Id37b15bee595ba10f207235a3ff59526e4423be6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/sqlalchemy/api.py         |   16 +++++++++-------
 heat/tests/test_engine_service.py |   10 ++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

commit 8bad76c00e3a9a9c5d5fb8a8cd4b50b91f2e16aa
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:25:25 2012 +0100

    RPC API: Clean up list_events results
    
    Just return a list, rather than wrapping it in an object. The client API
    processes can (and do) do whatever wrapping they need.
    
    Change-Id: Ia77facbc7577ec96d1fa0e6e2784f4e5cff68614
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py           |    4 +---
 heat/api/openstack/v1/events.py     |    8 ++------
 heat/engine/service.py              |    4 +---
 heat/tests/test_api_cfn_v1.py       |   35 +++++++++++++++++------------------
 heat/tests/test_api_openstack_v1.py |   24 ++++++++++++------------
 heat/tests/test_engine_service.py   |    5 +----
 6 files changed, 34 insertions(+), 46 deletions(-)

commit ee208680d8924e78dad4e6b5f9e287a31b5940f3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:25:25 2012 +0100

    RPC API: Clean up list_stacks results
    
    Just return a list, rather than wrapping it in an object. The client API
    processes can (and do) do whatever wrapping they need.
    
    Change-Id: I4a8e64e8e4a0f127e8fa5c12738353a1f3a0c22f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py           |    3 +--
 heat/api/openstack/v1/stacks.py     |    4 +---
 heat/engine/service.py              |    2 +-
 heat/tests/test_api_cfn_v1.py       |    5 ++---
 heat/tests/test_api_openstack_v1.py |   38 +++++++++++++++++------------------
 heat/tests/test_engine_service.py   |    6 +++---
 6 files changed, 26 insertions(+), 32 deletions(-)

commit 1e88faa414da77e2726b22ff0b0892e91a5a85d1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 21 17:25:25 2012 +0100

    RPC API: Clean up show_stack results
    
    Just return a list, rather than wrapping it in an object. The client API
    processes can (and do) do whatever wrapping they need.
    
    Change-Id: Ibb9955a9c3fc25b88cf3914f2a3ea7cedaf2aa9b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py           |    2 +-
 heat/api/openstack/v1/stacks.py     |    4 +-
 heat/engine/service.py              |    2 +-
 heat/tests/test_api_cfn_v1.py       |  100 +++++++++++++++++------------------
 heat/tests/test_api_openstack_v1.py |   36 ++++++-------
 heat/tests/test_engine_service.py   |   10 ++--
 6 files changed, 75 insertions(+), 79 deletions(-)

commit 353160f37182da3852206d9b26383442e1c21ec5
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Dec 20 17:36:14 2012 -0500

    Include new doc directory
    
    Change-Id: If5041669717aaa9287bff315b9b6e4f9db7b374f
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit 06ed997784469e8c4a571f8cbd5174346a6b05d9
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Dec 20 15:37:29 2012 +0000

    run_tests.sh fixup venv/novenv logic
    
    The section which prompts y/n for creating a new venv can never be
    reached with any combination of CLI options (since always_venv=0 and
    never_venv=0 can never happen simultaneously)
    
    This actually makes the --no-virtual-env option pointless, so we may
    as well remove it and explicitly set it as the default (it was anyway
    previously but by virtue of the never_venv option being undefined)
    
    Change-Id: I3c803533fda55a6814b7536b5c1328312acd3d57
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 run_tests.sh |   26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

commit e098963e8617d32909795c9b389dee848b637636
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Dec 20 11:28:53 2012 +0000

    run_tests.sh cosmetic, make if/then style consistent
    
    I introduced an inconsistent style with the pep8 check patch, so fixing this up here
    
    Change-Id: I9a1a612172e493e0d2476c7f6613bbb9b9de2878
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 run_tests.sh |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit ad24068745b82c66946f231f8832ac426302f13c
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Dec 20 11:24:12 2012 +0000

    run_tests.sh cosmetic cleanup indents
    
    fix indents so it's consistent ts=4
    
    Change-Id: I6fb2e7b3670bba00ad45d76d2dbb6b56c25281ff
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 run_tests.sh |  104 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

commit f9cf2d751958264f9b7e5c861859e6be7da372f5
Merge: 760a187 58a1fde
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 20 10:59:49 2012 +0000

    Merge "Avoid logging.getChild for python2.6 compatibility"

commit 760a187640ddf1ee6aab41614d7232702eb65a78
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 19 17:27:49 2012 +0000

    update tox.ini to pep8 latest (1.3.4)
    
    Most of the core projects are currently 1.3.3, but since 1.3.4 is
    the current latest it seemed best to align with the latest.A
    Also add a check to run_tests.sh to ensure peoples local tests align
    with the new gate version
    
    fixes bug 1092057
    
    Change-Id: I16dc7e51536781f7a14b7954c24b1aa078b37fa8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 run_tests.sh |   26 ++++++++++++++++++++++----
 tox.ini      |    2 +-
 2 files changed, 23 insertions(+), 5 deletions(-)

commit 7ebef0b9dcbe815c61e30ecf0a51f0706e11b76b
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 19 17:23:05 2012 +0000

    heat cleanups to align unit tests with pep8 1.3.4
    
    Lots of (mostly whitespace) cleanups to align all the unit test code
    with pep8 v1.3.4
    
    ref bug 1092057
    
    Change-Id: I5c847f20b3516af3dd3d7211b0fc697c59bf914c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/fakes.py                 |   10 +-
 heat/tests/test_api_aws.py          |   66 ++--
 heat/tests/test_api_cfn_v1.py       |  714 ++++++++++++++++++-----------------
 heat/tests/test_api_cloudwatch.py   |  253 +++++++------
 heat/tests/test_api_openstack_v1.py |   59 ++-
 heat/tests/test_autoscaling.py      |   19 +-
 heat/tests/test_cli.py              |    3 +-
 heat/tests/test_dbinstance.py       |    4 +-
 heat/tests/test_eip.py              |   10 +-
 heat/tests/test_engine_service.py   |  107 +++---
 heat/tests/test_identifier.py       |    2 +-
 heat/tests/test_instance.py         |   26 +-
 heat/tests/test_loadbalancer.py     |   20 +-
 heat/tests/test_parameters.py       |    2 +-
 heat/tests/test_parser.py           |   23 +-
 heat/tests/test_properties.py       |    7 +-
 heat/tests/test_quantum.py          |   32 +-
 heat/tests/test_resource.py         |    4 +-
 heat/tests/test_s3.py               |   24 +-
 heat/tests/test_template_format.py  |   20 +-
 heat/tests/test_user.py             |   12 +-
 heat/tests/test_validate.py         |  208 +++++-----
 heat/tests/test_volume.py           |   38 +-
 heat/tests/test_vpc.py              |    4 +-
 heat/tests/test_waitcondition.py    |   40 +-
 heat/tests/test_watch.py            |  104 +++--
 heat/tests/v1_1/fakes.py            |  447 +++++++++-------------
 27 files changed, 1101 insertions(+), 1157 deletions(-)

commit 1a4decc02fc2a45e6fdff2c9ce01b9a298b12ed5
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 19 13:45:21 2012 +0000

    heat cleanups to align functional tests with pep8 1.3.4
    
    Lots of (mostly whitespace) cleanups to align all the functional test code
    with pep8 v1.3.4
    
    ref bug 1092057
    
    Change-Id: Ifd6ef02bf3abd0b2f351f63423ab8aa7ff0cbd7c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../functional/test_AutoScalingMultiAZSample.py    |    2 +-
 heat/tests/functional/test_CFN_API_Actions.py      |  116 ++++++++++----------
 heat/tests/functional/test_CFN_API_Actions_Boto.py |   62 +++++------
 heat/tests/functional/test_CFN_API_UpdateStack.py  |   12 +-
 .../functional/test_HAProxy_Single_Instance.py     |    4 +-
 .../functional/test_OpenShift_Prebuilt_JEOS.py     |    2 +-
 .../tests/functional/test_WordPress_2_Instances.py |    6 +-
 .../test_WordPress_2_Instances_With_EBS.py         |    8 +-
 .../test_WordPress_2_Instances_With_EBS_EIP.py     |   15 ++-
 .../test_WordPress_Composed_Instances.py           |   11 +-
 .../functional/test_WordPress_Single_Instance.py   |    2 +-
 .../test_WordPress_Single_Instance_Boto.py         |    4 +-
 .../test_WordPress_Single_Instance_With_EBS.py     |    8 +-
 .../test_WordPress_Single_Instance_With_EBS_EIP.py |    8 +-
 .../test_WordPress_Single_Instance_With_EIP.py     |    6 +-
 .../test_WordPress_Single_Instance_With_HA.py      |    6 +-
 .../test_WordPress_Single_Instance_With_IHA.py     |    6 +-
 heat/tests/functional/test_WordPress_With_LB.py    |   11 +-
 heat/tests/functional/test_WordPress_With_RDS.py   |    6 +-
 heat/tests/functional/util.py                      |   82 ++++++++------
 20 files changed, 200 insertions(+), 177 deletions(-)

commit c1bf924c0f2f18e775d0d75b56b7447410c1eea4
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 19 13:13:30 2012 +0000

    heat cleanups to align with pep8 1.3.4
    
    Lots of (mostly whitespace) cleanups to align all the non-test code with
    pep8 v1.3.4
    
    ref bug 1092057
    
    Change-Id: I444b288444dba4ec1da5854bd276d091c06d8489
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat-cfn                                       |   35 +++--
 bin/heat-engine                                    |    3 +-
 heat/api/aws/ec2token.py                           |    2 +-
 heat/api/aws/exception.py                          |    2 +-
 heat/api/aws/utils.py                              |    2 +-
 heat/api/cfn/v1/__init__.py                        |    2 +-
 heat/api/cfn/v1/stacks.py                          |   57 +++++----
 heat/api/cfn/v1/waitcondition.py                   |    9 +-
 heat/api/cloudwatch/__init__.py                    |    2 +-
 heat/api/cloudwatch/watch.py                       |   60 ++++-----
 heat/api/middleware/version_negotiation.py         |    6 +-
 heat/cfn_client/boto_client.py                     |   80 ++++++------
 heat/cfn_client/boto_client_cloudwatch.py          |   60 ++++-----
 heat/cfn_client/client.py                          |   21 ++-
 heat/cfn_client/utils.py                           |    7 +-
 heat/common/auth.py                                |    9 +-
 heat/common/auth_token.py                          |    4 +-
 heat/common/client.py                              |    6 +-
 heat/common/config.py                              |  134 ++++++++++----------
 heat/common/context.py                             |    6 +-
 heat/common/heat_keystoneclient.py                 |    2 +-
 heat/common/identifier.py                          |    2 +-
 heat/common/template_format.py                     |    6 +-
 heat/common/wsgi.py                                |   13 +-
 heat/db/api.py                                     |    3 +-
 heat/db/sqlalchemy/api.py                          |   48 +++----
 .../migrate_repo/versions/001_norwhal.py           |   47 ++++---
 .../migrate_repo/versions/004_guest_watch.py       |    8 +-
 .../migrate_repo/versions/005_user_creds.py        |    6 +-
 .../migrate_repo/versions/012_stack_id_uuid.py     |   62 +++++----
 .../migrate_repo/versions/013_owner_id_uuid.py     |   35 ++---
 .../migrate_repo/versions/014_watch_stackid.py     |    2 +-
 heat/db/sqlalchemy/migration.py                    |    6 +-
 heat/db/sqlalchemy/models.py                       |   39 +++---
 heat/db/sqlalchemy/session.py                      |    7 +-
 heat/engine/api.py                                 |    2 +-
 heat/engine/clients.py                             |    4 +-
 heat/engine/parameters.py                          |    4 +-
 heat/engine/parser.py                              |   10 +-
 heat/engine/properties.py                          |    6 +-
 heat/engine/resource.py                            |    2 +-
 heat/engine/resources/cloud_watch.py               |   65 ++++++----
 heat/engine/resources/instance.py                  |   16 +--
 heat/engine/resources/loadbalancer.py              |    2 +-
 heat/engine/resources/quantum/floatingip.py        |   22 ++--
 heat/engine/resources/quantum/net.py               |    9 +-
 heat/engine/resources/quantum/port.py              |   29 ++---
 heat/engine/resources/quantum/quantum.py           |    5 +-
 heat/engine/resources/quantum/router.py            |   29 ++---
 heat/engine/resources/quantum/subnet.py            |   41 +++---
 heat/engine/resources/s3.py                        |   29 ++---
 heat/engine/resources/security_group.py            |    6 +-
 heat/engine/resources/stack.py                     |    4 +-
 heat/engine/resources/user.py                      |   12 +-
 heat/engine/resources/volume.py                    |    9 +-
 heat/engine/resources/vpc.py                       |    8 +-
 heat/engine/resources/wait_condition.py            |    6 +-
 heat/engine/service.py                             |   14 +-
 heat/engine/watchrule.py                           |   10 +-
 heat/openstack/common/iniparser.py                 |    2 +-
 heat/openstack/common/log.py                       |    4 +-
 heat/openstack/common/notifier/list_notifier.py    |    7 +-
 heat/rpc/client.py                                 |   11 +-
 heat/testing/runner.py                             |   21 ++-
 tools/install_venv.py                              |    9 +-
 65 files changed, 622 insertions(+), 569 deletions(-)

commit 8936c971722b80c5c39bd689774fece7506aeb29
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:26 2012 +0100

    Fix DescribeStacks command for all stacks
    
    Fixes: bug 1092196
    
    Change-Id: I05065c08b4072a9c179ebfb36fb15f062de3f06e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/service.py            |   12 +++++------
 heat/rpc/client.py                |    7 +++----
 heat/tests/test_engine_service.py |   41 ++++++++++++++++++++++++++++++++++---
 3 files changed, 47 insertions(+), 13 deletions(-)

commit a9c0547673a686360d7f7504ce92f56bb6337b1f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:25 2012 +0100

    ReST API: Improve format of resource_types response
    
    Wrap the list in a JSON object for consistency with other APIs, both in
    Heat and the rest of OpenStack.
    
    Change-Id: I626f1c2446416c8e869fdc7d4f3772ec6c6d191c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py     |    2 +-
 heat/tests/test_api_openstack_v1.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit aeae520f6e9c27661287b64707473d8b188ad173
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:25 2012 +0100

    Return an ARN as the Ref for nested stacks
    
    Change-Id: I32b6b952dcd29ba895fc7b22dd362352068c85bf
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/stack.py |    3 +++
 1 file changed, 3 insertions(+)

commit 3ea38ccdb30c94068e5bb9ce39d673d78c8a7c48
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 19:31:32 2012 +0100

    Split nested stack implementation into abstract and concrete
    
    Split the Stack resource class into an abstract part from which other
    resource types inherit and a concrete implementation of the
    AWS::CloudFormation::Stack resource type.
    
    Change-Id: Ie7600b94e17ec31b55bae5c4d9501d3f0cbca97c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/dbinstance.py   |    2 +-
 heat/engine/resources/loadbalancer.py |   13 ++++------
 heat/engine/resources/stack.py        |   42 ++++++++++++++++-----------------
 heat/tests/test_dbinstance.py         |   23 ++++++++++--------
 4 files changed, 39 insertions(+), 41 deletions(-)

commit 58a1fde2000d998f126eaefcd279c5769cd765a7
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 19 18:01:15 2012 +0000

    Avoid logging.getChild for python2.6 compatibility
    
    Tweaking common.config setup_logging to avoid using the getChild()
    convenience function means we can run on python 2.6, as getChild was
    new in python 2.7
    
    Change-Id: I03698ad09eb16d4f1004512d27b049f22b41c22c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/common/config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f0d3c6e8466d3376cd81fff97efa7e12c6d5b571
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:25 2012 +0100

    RPC API: Pass a stack identifier to metadata_update
    
    This brings it into line with all of the other RPC functions.
    
    bug 1088937
    
    Change-Id: Ia45a12d652e96fb6bb03ce90d0b5a5e2ddeeb510
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/waitcondition.py  |    2 +-
 heat/engine/service.py            |    9 ++++-----
 heat/rpc/client.py                |    4 ++--
 heat/tests/test_engine_service.py |   13 +++++++++----
 heat/tests/test_rpc_client.py     |    2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)

commit 972aad8848bbdaa44240c14b2c9c0a548af3bccc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:25 2012 +0100

    Pass correct types in RPC Client unit tests
    
    Pass an actual identity structure for the identity.
    
    Change-Id: I0930520c8329100ba27aa6db0d977dfcd8a097c1
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_rpc_client.py |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

commit d5e13e945ef6136909c3bcd3072a802eae3f7df9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 19 18:48:25 2012 +0100

    Update links in composed templates
    
    These have changed due to the move of the project repository from the
    heat-api to openstack organisations on GitHub.
    
    Change-Id: Ib11116d7ca48e108e06d1dea9d9decd17bbf25cd
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 templates/WordPress_Composed_Instances.template |    2 +-
 templates/WordPress_With_LB.template            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit c4777794e78e2124f788a0b321e15febe71ee077
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Dec 14 14:13:05 2012 +1300

    A new documention structure, ready for contributions
    
    Here are some skeletons for the documentation which will need to be written.
    
    doc/source
    	A Sphinx based document which will be aimed at heat developers.
        	This also contains .rst files which generate the man files
    doc/docbkx/api-ref
    	Docbook and WADL for the REST API, with the intent of moving this
    	to api-site to publish to api.openstack.org
    doc/docbkx/heat-admin
    	Docbook manual targeted at Heat admins, with the intent of moving this
            to openstack-manuals to publish to docs.openstack.org
    doc/docbkx/heat-cli
    	Docbook manual targeted at users of the Heat CLI, with the intent of
    	moving this to openstack-manuals to publish to docs.openstack.org
    
    Dude, wheres my man pages?
    docs/man
    	is deleted, now generated into doc/build/man
    
    Packaging will need to be updated to generate the man pages
    
    Change-Id: Idf2f37086b6f97df18ed57172de2f9e3d4c7706a

 doc/.gitignore                                     |    2 +
 doc/Makefile                                       |  153 ++++++++++++
 doc/README.rst                                     |   35 +++
 doc/docbkx/README.rst                              |   35 +++
 doc/docbkx/api-ref/pom.xml                         |   76 ++++++
 doc/docbkx/api-ref/src/docbkx/api-ref.xml          |   24 ++
 .../src/wadls/heat-api/src/heat-api-1.0.wadl       |   13 +
 doc/docbkx/heat-admin/app_core.xml                 |   16 ++
 doc/docbkx/heat-admin/bk-heat-admin-guide.xml      |   69 ++++++
 doc/docbkx/heat-admin/ch_install.xml               |   19 ++
 doc/docbkx/heat-admin/ch_limitations.xml           |   43 ++++
 doc/docbkx/heat-admin/ch_overview.xml              |   57 +++++
 doc/docbkx/heat-admin/ch_preface.xml               |   68 +++++
 doc/docbkx/heat-admin/ch_using.xml                 |   43 ++++
 doc/docbkx/heat-admin/pom.xml                      |  151 ++++++++++++
 doc/docbkx/heat-cli-guide/pom.xml                  |  132 ++++++++++
 doc/docbkx/heat-cli-guide/src/bk-cli-guide.xml     |   15 ++
 .../heat-cli-guide/src/heat_cli_commands.xml       |   22 ++
 doc/docbkx/heat-cli-guide/src/heat_cli_howto.xml   |   13 +
 doc/docbkx/heat-cli-guide/src/heat_cli_install.xml |   84 +++++++
 doc/source/conf.py                                 |  259 ++++++++++++++++++++
 doc/source/index.rst                               |   25 ++
 doc/source/man/heat-api-cfn.rst                    |   40 +++
 doc/source/man/heat-api-cloudwatch.rst             |   34 +++
 doc/source/man/heat-api.rst                        |   40 +++
 doc/source/man/heat-cfn.rst                        |  199 +++++++++++++++
 doc/source/man/heat-engine.rst                     |   38 +++
 doc/source/man/index.rst                           |   24 ++
 docs/man/man1/heat-api-cfn.1                       |   43 ----
 docs/man/man1/heat-boto.1                          |  198 ---------------
 docs/man/man1/heat-cfn.1                           |  243 ------------------
 docs/man/man1/heat-db-setup.1                      |   77 ------
 docs/man/man1/heat-engine.1                        |   43 ----
 33 files changed, 1729 insertions(+), 604 deletions(-)

commit 083c0cc2b0137f1d0bf8ea03ae312489b7582933
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Dec 18 18:00:09 2012 +0000

    pip-requires PyCrypto should be >= 2.1.0
    
    We need PyCrypto>=2.1.0 for Random which is used in
    heat.common.crypt
    
    Change-Id: Ib951deaca17f972aa70a2a65f6e3ade5fb509981
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit eb7116006978fe7063601b1c6c74c04abc826e33
Author: Clint Byrum <clint@fewbar.com>
Date:   Mon Dec 17 17:57:30 2012 -0800

    Add support for missing Instance attributes PrivateIp and PublicDnsName.
    
    Change-Id: I9d85f00a8ca687ad791be4a9fa6708df3ad67a55
    Fixes: bug #1091497

 heat/engine/resources/instance.py |    6 ++++--
 heat/tests/test_instance.py       |   11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

commit 6e3d20c136e7a2dda610cc663e0e443a148cb997
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 17 19:56:23 2012 +0100

    GettingStarted: Install python-pip package
    
    pip-python is not installed by default, so we need to install it in order
    to be able to use it. (An alternative would be to use easy_install, which
    is packaged as part of setuputils and therefore already present, but it
    lacks any of pip-python's package management capabilities.)
    
    Change-Id: I6a620d0864b6671348bbcf962c3c2cde06f9ed83
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |    1 +
 1 file changed, 1 insertion(+)

commit 50cbd80650655338b7563966083388b564f8567c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 17 19:56:22 2012 +0100

    Fix issues with deleting a WaitCondition
    
    Previously we were ignoring the reference to the WaitConditionHandle stored
    in the database by always setting it to None on load. This meant that we
    had to try to recreate it on delete, which would fail if e.g. the
    WaitConditionHandle had already been deleted.
    
    bug 1089354
    
    Change-Id: Ibc4145348a91b455e97ba27748ff72451b0c7bce
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/wait_condition.py |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

commit 31899c01ce6b42e98b0ebb95089d5944c3c4950c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 17 17:11:03 2012 +0100

    Fix importing of novaclient exceptions
    
    Broken by 3c702e38e9a51a15a8d1626b60f610c75cb1f8b7
    
    Also, use novaclient's own mechanism for selecting the correct API version;
    don't go fishing in the internals.
    
    Change-Id: I296312f185735026587ba9849343aa79177856a3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/clients.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit f1e1f22c902c1708616629a4b8cb6a60221ab3a8
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 17 10:51:37 2012 +0000

    tools/openstack_ubuntu fix nova-manage network create command
    
    Command for creating nova network is wrong, as tested on 12.04
    
    ref bug 1083507
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I41ae9370c42a0e9b7df4d1810e0f90f32bd87bba

 tools/openstack_ubuntu |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit a64fc0bc4b3a3104778efcbf5151783922172e49
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 22:45:07 2012 +0100

    Handle empty UserData for instance
    
    UserData is not required, so handle the case where it is not supplied (i.e.
    is None).
    
    bug 1090544
    
    Change-Id: If8bfe9ba2aafe3bb2e9de14b01c57d1ddcf9b21d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/instance.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d9105f57e1c5dc27c5cd21efa20932cdc9df37fe
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 11:05:59 2012 +0100

    Make resource registration conditional
    
    If client libraries are not present for Swift or Quantum, don't register
    the corresponding resource types.
    
    Change-Id: I95a42973775b7f4c1d82caa47dc0660dfe54bb21
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/quantum/floatingip.py |    4 ++++
 heat/engine/resources/quantum/net.py        |    4 ++++
 heat/engine/resources/quantum/port.py       |    4 ++++
 heat/engine/resources/quantum/router.py     |    4 ++++
 heat/engine/resources/quantum/subnet.py     |    4 ++++
 heat/engine/resources/s3.py                 |    3 +++
 6 files changed, 23 insertions(+)

commit 19402ffe8020ff6b2567a3554e61c0a691786b3b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 22:23:44 2012 +0100

    Add a resource type list to the ReST API
    
    Change-Id: I09f5e9fc97ef095c7ab8def8adf4dcc79c6fcd48
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/api.md                         |   11 ++++++++++
 heat/api/openstack/v1/__init__.py   |    4 ++++
 heat/api/openstack/v1/stacks.py     |   13 ++++++++++++
 heat/tests/test_api_openstack_v1.py |   39 +++++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+)

commit e2a67113c261c24b975bbb093bfbf64cdc0b9f2a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 22:23:44 2012 +0100

    Add an RPC API to list resource types
    
    Change-Id: I0218dcebf9213887e9b7883e6bba9b6b54a6e6ad
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resource.py           |    6 ++++++
 heat/engine/service.py            |    8 ++++++++
 heat/rpc/client.py                |    9 +++++++++
 heat/tests/test_engine_service.py |    5 +++++
 4 files changed, 28 insertions(+)

commit 3c702e38e9a51a15a8d1626b60f610c75cb1f8b7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 22:23:44 2012 +0100

    Standardise client imports
    
    Do all client imports once, in the clients module, using the normal
    OpenStack idiom for optional imports where appropriate.
    
    Change-Id: I1186eba21159fe20e80c1947779fd164dada5880
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/clients.py                  |   33 +++++++++++++------------------
 heat/engine/resources/eip.py            |    6 +++---
 heat/engine/resources/instance.py       |    8 ++++----
 heat/engine/resources/loadbalancer.py   |    4 ++--
 heat/engine/resources/s3.py             |   12 ++++-------
 heat/engine/resources/security_group.py |    9 ++++-----
 heat/engine/resources/volume.py         |    5 ++---
 7 files changed, 33 insertions(+), 44 deletions(-)

commit 55abd364dd35d5ee466d0c7673422a4a6d533024
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 14 22:23:44 2012 +0100

    Fix ReST API documentation for template validation
    
    The user parameters are not used in template validation.
    
    Change-Id: Iba438b2977f8029c0f0f7e6e65e853d23e4d2b0d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/api.md |    5 -----
 1 file changed, 5 deletions(-)

commit 4aa39467068cb1ca0de792a27290e19111db649b
Merge: 32855ed 22c3ac8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 14 19:12:00 2012 +0000

    Merge "Add ubuntu version of tools/openstack"

commit 32855ed499d4dba05282ec3b93088eb88dc61805
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 14 09:49:31 2012 +0000

    install.sh non-root error should go to stderr
    
    The non-root error should go to stderr like the other echo output
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I1d9c51c43f9a2db0b50c4c95fc0a0e4505078c51

 install.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fc83066295b3a0afcee38f2dd79f8be4b0bedb6b
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 14 09:47:33 2012 +0000

    install.sh add logic detecting rabbitmq
    
    Detect rabbitmq (On Ubuntu and Fedora), and sed the config files
    with appropriate values if it looks like we're installing on a
    system with rabbitmq and not the default qpidd
    
    fixes bug 1090420
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I04a40aab00e7e13d245900aeb384d769d57c4012

 install.sh |   37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

commit 59dff06de4364ed1e2e332337f2bb8d3d9e494e9
Merge: afc2a57 2f4bce0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 14 17:15:00 2012 +0000

    Merge "tools/openstack fixup header formatting"

commit 2f4bce00f0172c6fcef0c9c1fd0adadc7e17e37e
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 14 16:11:02 2012 +0000

    tools/openstack fixup header formatting
    
    Current header is abbreviated, so paste in the full boilerplate
    text like in other files
    
    Change-Id: I8675f80f37ab6ea2ba2323f3f87985224883466a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/openstack |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

commit 22c3ac823a92d9c8aafde2ca89958d8500d4709a
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 14 15:33:40 2012 +0000

    Add ubuntu version of tools/openstack
    
    Initial version of the tools/openstack install script to simplify install/
    testing on Ubuntu - tested on 12.04LTS (with the included Essex packages)
    12.10 testing TODO
    
    ref bug 1083507
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I450b20e18dfa3099cfd17152b5ec61cc34122665

 tools/openstack_ubuntu |  342 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 342 insertions(+)

commit afc2a57a9ddb2be6e703150f91f753e33850a631
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 14 09:44:03 2012 +0000

    install.sh simplify heat-engine.conf conditional
    
    Minor tweak to the conditional detecting heat-engine.conf to sed in the
    encryption key - this will allow rabbitmq detection to only be done in
    one place
    
    ref bug 1090420
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I9031218796a52efd350c39167ecb112048dad218

 install.sh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit aaded4d3fa6b57ddbf574c19d5e7aa3bddb8853d
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Dec 13 17:25:46 2012 -0500

    Remove heat-metadata man page
    
    The binary no longer exists.
    
    Change-Id: Ib914f94d091b1388d254c53dc3a7821750266b18
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 docs/man/man1/heat-metadata.1 |   45 -----------------------------------------
 1 file changed, 45 deletions(-)

commit ad93b7d5cf29916a1c7d7896995173d7fcb07ce3
Merge: cd6db6d 8ed406a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 13 18:07:41 2012 +0000

    Merge "heat_keystoneclient ec2 user fix"

commit cd6db6d4faae1bea073750dbc6a39dc8b1e772ab
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 13 16:11:54 2012 +0100

    Get rid of naked "except:" clauses in tests
    
    Change-Id: Idec15ef86ff0f9cb57b4a8c522e4f5ed63bad010
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/functional/test_CFN_API_Actions.py      |    3 +--
 heat/tests/functional/test_CFN_API_Actions_Boto.py |    3 +--
 heat/tests/functional/test_CFN_API_UpdateStack.py  |    3 +--
 heat/tests/functional/verify.py                    |    2 +-
 heat/tests/test_s3.py                              |    2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

commit 8d1e6e3ab5fba4d1a813c605142227a53ed211ef
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 13 15:37:25 2012 +0100

    Don't skip watchrule test on exception
    
    There are no circumstances in which failing to import the
    heat.engine.watchrule module would not be an issue.
    
    Change-Id: I6d03ed8f761a24aa69409010390289e387523813
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_watch.py |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit f531f6fb28198ce964b5281332160c18bdccbd9d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 13 15:02:29 2012 +0100

    Get rid of unused imports
    
    This cruft just tends to build up over time...
    
    Change-Id: I61fd067b431aaa57164c7ff781c9cc8bab04bd4b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-cfn                                       |    1 -
 bin/heat-watch                                     |    2 --
 heat/api/cfn/v1/waitcondition.py                   |    3 ---
 heat/cfn_client/boto_client.py                     |    1 -
 heat/cfn_client/client.py                          |    2 --
 heat/common/urlfetch.py                            |    2 --
 .../migrate_repo/versions/013_owner_id_uuid.py     |    1 -
 heat/engine/api.py                                 |    2 --
 heat/engine/clients.py                             |    1 -
 heat/engine/resources/quantum/subnet.py            |    2 --
 heat/engine/resources/stack.py                     |    3 ---
 heat/engine/resources/user.py                      |    1 -
 heat/engine/service.py                             |    1 -
 heat/engine/watchrule.py                           |    1 -
 heat/testing/runner.py                             |    2 --
 heat/tests/__init__.py                             |    1 -
 heat/tests/functional/test_CFN_API_UpdateStack.py  |    2 --
 .../functional/test_OpenShift_Prebuilt_JEOS.py     |    1 -
 heat/tests/functional/util.py                      |    3 ---
 heat/tests/test_api_aws.py                         |    3 ---
 heat/tests/test_api_cfn_v1.py                      |    3 ---
 heat/tests/test_api_cloudwatch.py                  |    7 -------
 heat/tests/test_autoscaling.py                     |    1 -
 heat/tests/test_dbinstance.py                      |    1 -
 heat/tests/test_eip.py                             |    1 -
 heat/tests/test_engine_service.py                  |    1 -
 heat/tests/test_identifier.py                      |    2 --
 heat/tests/test_instance.py                        |    4 ----
 heat/tests/test_loadbalancer.py                    |    1 -
 heat/tests/test_parameters.py                      |    3 ---
 heat/tests/test_parser.py                          |    1 -
 heat/tests/test_properties.py                      |    1 -
 heat/tests/test_quantum.py                         |    1 -
 heat/tests/test_resource.py                        |    1 -
 heat/tests/test_s3.py                              |    1 -
 heat/tests/test_template_format.py                 |    2 --
 heat/tests/test_user.py                            |    2 --
 heat/tests/test_validate.py                        |    1 -
 heat/tests/test_volume.py                          |    1 -
 heat/tests/test_waitcondition.py                   |    1 -
 heat/tests/test_watch.py                           |    1 -
 setup.py                                           |    4 ----
 tools/experimental_ssh_eventlet.py                 |    1 -
 43 files changed, 77 deletions(-)

commit b9e5bcb68993c8b51f3955ee691e1f551687da1e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 13 15:57:59 2012 +0100

    Get rid of nose.main() in unit test files
    
    This doesn't actually work and is not universally present, so get rid of
    it. Tests are run through "nosetests", which does actually work.
    
    Change-Id: Ib2d1e857e0aef4eab5fd75ffb1a498d8e9186c01
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 .../functional/test_AutoScalingMultiAZSample.py    |    1 -
 heat/tests/functional/test_CFN_API_UpdateStack.py  |    1 -
 .../functional/test_HAProxy_Single_Instance.py     |    1 -
 .../functional/test_OpenShift_Prebuilt_JEOS.py     |    1 -
 .../test_WordPress_2_Instances_With_EBS_EIP.py     |    1 -
 .../test_WordPress_Composed_Instances.py           |    1 -
 .../functional/test_WordPress_Single_Instance.py   |    1 -
 .../test_WordPress_Single_Instance_Boto.py         |    1 -
 .../test_WordPress_Single_Instance_With_HA.py      |    1 -
 .../test_WordPress_Single_Instance_With_IHA.py     |    1 -
 heat/tests/functional/test_WordPress_With_LB.py    |    1 -
 heat/tests/functional/test_WordPress_With_RDS.py   |    1 -
 heat/tests/functional/util.py                      |    7 -------
 heat/tests/test_api_aws.py                         |    7 -------
 heat/tests/test_api_cfn_v1.py                      |    7 -------
 heat/tests/test_api_cloudwatch.py                  |    7 -------
 heat/tests/test_api_openstack_v1.py                |    7 -------
 heat/tests/test_autoscaling.py                     |    7 -------
 heat/tests/test_dbinstance.py                      |    7 -------
 heat/tests/test_dependencies.py                    |    7 -------
 heat/tests/test_eip.py                             |    7 -------
 heat/tests/test_engine_api_utils.py                |    1 -
 heat/tests/test_engine_service.py                  |    8 --------
 heat/tests/test_identifier.py                      |    7 -------
 heat/tests/test_instance.py                        |    7 -------
 heat/tests/test_loadbalancer.py                    |    7 -------
 heat/tests/test_parameters.py                      |    7 -------
 heat/tests/test_parser.py                          |    7 -------
 heat/tests/test_plugin_loader.py                   |    1 -
 heat/tests/test_properties.py                      |    6 ------
 heat/tests/test_quantum.py                         |    7 -------
 heat/tests/test_resource.py                        |    6 ------
 heat/tests/test_s3.py                              |    7 -------
 heat/tests/test_template_format.py                 |    1 -
 heat/tests/test_urlfetch.py                        |    1 -
 heat/tests/test_user.py                            |    7 -------
 heat/tests/test_validate.py                        |    9 ++-------
 heat/tests/test_volume.py                          |    7 -------
 heat/tests/test_vpc.py                             |    8 --------
 heat/tests/test_waitcondition.py                   |    7 -------
 heat/tests/test_watch.py                           |    1 -
 41 files changed, 2 insertions(+), 185 deletions(-)

commit 8ed406aac973d9fdbc1c22385d084680d5bc9f86
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 12 17:06:55 2012 +0000

    heat_keystoneclient ec2 user fix
    
    Fix bug where we incorrectly use the request context user_id,
    instead of the user_id associated with the resource calling
    get_ec2_keypair()
    
    fixes bug 1089035
    
    Change-Id: Ibb5e6d11461fb3ff1dd743066a9f7de3ee65b445
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/common/heat_keystoneclient.py |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

commit 4fc1f27f120d86a1a7872ba07d5b61dcaeab535c
Merge: 5ef68bb 9ceadd6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 13 12:59:34 2012 +0000

    Merge "heat cfn api, format waitcondition error responses correctly"

commit 5ef68bbc45fccc597679f3a05883947a44323c85
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 13 11:20:33 2012 +0100

    Move the cfn client code to a subpackage
    
    This will make packaging easier.
    
    Change-Id: I8e0f0a3d85bdf073a3b3272f920ad60f27e929e3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-cfn                              |    6 +-
 bin/heat-watch                            |    4 +-
 heat/boto_client.py                       |  297 -----------------------------
 heat/boto_client_cloudwatch.py            |  210 --------------------
 heat/cfn_client/boto_client.py            |  297 +++++++++++++++++++++++++++++
 heat/cfn_client/boto_client_cloudwatch.py |  210 ++++++++++++++++++++
 heat/cfn_client/client.py                 |  191 +++++++++++++++++++
 heat/cfn_client/utils.py                  |   57 ++++++
 heat/client.py                            |  191 -------------------
 heat/common/client.py                     |    2 +-
 heat/tests/functional/util.py             |    4 +-
 heat/utils.py                             |   57 ------
 12 files changed, 763 insertions(+), 763 deletions(-)

commit 9ceadd6730d09707347b077385a36253a94ff258
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 12 15:01:54 2012 +0000

    heat cfn api, format waitcondition error responses correctly
    
    Return errors from the waitcondition part of the CFN API in a similar
    format to other CFN API responses, by catching engine errors and mapping
    the error to an appropriate HeatAPIException.
    
    fixes bug 1089032
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I40486ed53fd4968519f623a3ea5a96f6c3374ea5

 heat/api/cfn/v1/waitcondition.py  |   47 ++++++++++---------------------------
 heat/engine/service.py            |    9 +++----
 heat/tests/test_engine_service.py |   16 ++++++++++---
 3 files changed, 28 insertions(+), 44 deletions(-)

commit 772818102cc815186ed44bfb2f78ca6c36266fbf
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 12 14:59:02 2012 +0000

    Override events for AutoScalingGroup instances
    
    Override state-transition events by subclassing the Instance
    resource to AutoScalingGroupInstance, this avoids problems where
    events can't lookup the resource via parser.Stack (since these
    resources aren't "real" resources defined in the template)
    
    fixes bug 1089338
    
    Change-Id: Ia064cd067eefdaa5ca81b0cb822ce2fa443bac85
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/resources/autoscaling.py |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

commit 355f03eec21883935f47232b3e00a5cf1de1680b
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Dec 12 14:57:11 2012 +0000

    resource state_set, abstract update/store logic
    
    Abstract the DB update/store logic so the state_set function
    can be more cleanly overridden for AutoScalingGroupInstance
    
    ref bug 1089338
    
    Change-Id: I02dc52068feaeed8ec8210269d9abb7b124f0a19
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/resource.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 4594c44aae197756de4135b6fe6efa39a9a04084
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 12 12:06:56 2012 +0100

    Don't allow identifiers with slashes
    
    Ensure that creating an Identifier with a slash in either the stack name or
    the resource name results in an immediate exception.
    
    Change-Id: I79121a26009b5b7b3eee994f98ba802b239f5f12
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/identifier.py     |    5 +++++
 heat/tests/test_identifier.py |   32 ++++++++++++++++++++------------
 2 files changed, 25 insertions(+), 12 deletions(-)

commit a560d1e206b87ac9d5e51a266dd6327cabe4f2cb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 12 13:47:33 2012 +0100

    Don't allow slashes in Stack or Resource names
    
    There is no way for the ReST API to handle Stack or Resource names that
    contain slashes since WSGI decodes the path before passing it to the
    application, such that even correctly url-encoded slashes are
    indistinguishable from path separators. Therefore, prohibit slashes in
    Stack and Resource names.
    
    bug 1088928
    
    Change-Id: Ie6fa5a1bc7b5ae7054300419644008c5cc42187e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parser.py             |    4 ++++
 heat/engine/resource.py           |    3 +++
 heat/tests/test_engine_service.py |   19 +++++++++++++++++++
 3 files changed, 26 insertions(+)

commit 67fe6165b821c5b9e85a6ec7ac8380dc95859204
Merge: 310204c 60ca97d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 12 08:27:53 2012 +0000

    Merge "Fix race condition in list_stacks"

commit 310204c816c0b4e8aa619d63a38201bb3e03a0fc
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Dec 12 14:48:17 2012 +1300

    Move resolved template comparison to stack update
    
    This partially reverts the following commit
    https://review.openstack.org/#/c/17563/3
    
    Resource comparison is now done as per Zane's last comment in that review.
    
    Change-Id: I1663d262b79603ab86bc5bdb4f2ee75e87c0075e

 heat/engine/parser.py   |    4 +++-
 heat/engine/resource.py |    7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

commit 60ca97d3918a428a5a852e658e93a8c834fd366c
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 10 16:18:26 2012 +1300

    Fix race condition in list_stacks
    
    A stack may be deleted between querying the stacks to list and formatting
    each stack.
    
    This issue was found by concurrently creating and deleting 100 stacks
    while running heat list.
    
    Change-Id: I4a47bbdbde111454672c2579caf28b4675c3cf10

 heat/engine/service.py |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

commit f7ebdd863b3fae58ecd810955ffe0aac50189c79
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Dec 11 20:23:36 2012 +0100

    Get rid of glanceclient dependency
    
    We're not actually using it anywhere, and its keystoneclient version
    requirements are causing us not to be able to install. Move it instead to
    the test-requires, since the functional tests are still actually using it.
    
    Change-Id: I74e68ddb4b65235b6c192c619e9e8e85e30beab9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/pip-requires  |    1 -
 tools/test-requires |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 0d10276c911a9f391dd7414de1b238f116c39bba
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Dec 4 16:33:51 2012 +0000

    heat engine : convert WaitConditionHandle URL to ARN format
    
    Convert the WaitConditionHandle URL format to use the ARN format,
    the resulting URL will be similar to the AWS format
    
    fixes bug 1087799
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I04b1f6cd913c54c9f4fa82cc1e76be22a19fe2ea

 heat/api/cfn/v1/__init__.py             |    2 +-
 heat/api/cfn/v1/waitcondition.py        |   15 +++++++------
 heat/engine/resources/wait_condition.py |   13 ++++++++---
 heat/tests/test_waitcondition.py        |   36 ++++++++++++++++++++++++-------
 4 files changed, 48 insertions(+), 18 deletions(-)

commit b3d3983bf10e8f9ed73903240460b4e2b03857b1
Merge: 1c95bb5 be33b33
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 11 14:37:28 2012 +0000

    Merge "heat : Add HeatIdentifier from_url function"

commit be33b3364cff9cc3211d93f1575be13f36172c0e
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Dec 4 16:33:13 2012 +0000

    heat : Add HeatIdentifier from_url function
    
    Add method to create a HeatIdentifier from a URL containing an ARN
    
    ref bug 1087799
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: Ie325de9105e85dbf9fd12be5e7b8c3d055e77795

 heat/common/identifier.py     |   29 +++++++++
 heat/tests/test_identifier.py |  131 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+)

commit 1c95bb5ee20d65c96b754219b76e4c54321928b4
Merge: ed7136d f24a2c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 22:09:13 2012 +0000

    Merge "Eventlet monkey-patch heat-api-cloudwatch."

commit ed7136da9f1d4a2514d182c80869d007202b1a56
Merge: bc70c02 110f8be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 22:06:49 2012 +0000

    Merge "Eventlet monkey-patch heat-api-cfn"

commit bc70c021564ba31bc33e00ab1cffcdb33270557b
Merge: 6b33a39 c4e73f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 22:05:58 2012 +0000

    Merge "Eventlet monkey-patch heat-api"

commit 6b33a39c72e9b24d30c76142d180c96e2ce459dc
Merge: bd56aa5 8bd7e0a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 21:43:21 2012 +0000

    Merge "Add test to simply run a few binaries"

commit f24a2c27c59b78b3c7f5fded9f73e15b6e607fe9
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 10 15:19:53 2012 +1300

    Eventlet monkey-patch heat-api-cloudwatch.
    
    Tested by getting responses from cloudwatch, but not with a full
    end-to-end cloudwatch validation
    Change-Id: I2d81adc8e63b9be7dec02083509ab706ae0c5a7f

 bin/heat-api-cloudwatch |    3 +++
 1 file changed, 3 insertions(+)

commit 110f8bea28aa4eca9e9dc2f1bd462e9ae6764fb0
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 10 15:19:20 2012 +1300

    Eventlet monkey-patch heat-api-cfn
    
    Tested by running bin/heat-cfn commands
    Change-Id: I158a0d8d9b545191001ecdabfa9f331cf937bf4e

 bin/heat-api-cfn |    3 +++
 1 file changed, 3 insertions(+)

commit c4e73f1f559a79567e94435830bcc77ac34eca54
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 10 15:07:40 2012 +1300

    Eventlet monkey-patch heat-api
    
    I have a stress test which uses python-heatclient to create
    an empty template, list the stacks, and delete the created stack.
    
    Running 100 of these jobs concurrently takes 64 seconds without this patch,
    and 17 seconds with it.
    
    Change-Id: I8963da477aa8fcec724e2e5afcd5ec92ff5b07d1

 bin/heat-api |    3 +++
 1 file changed, 3 insertions(+)

commit bd56aa58cc67b86440d9bed05c880641afce3108
Merge: 46aac23 7abb73f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 18:38:37 2012 +0000

    Merge "Don't pass -1 as a stack_id in unit tests"

commit 46aac2380eef8011e26b7b88d276305d1a663c7e
Merge: 6f74587 c0a9518
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 18:33:46 2012 +0000

    Merge "Make Volume tests independent"

commit 6f74587b956045c2faf4267560573c132374e507
Merge: 0e90ed6 53d4e6a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 18:29:30 2012 +0000

    Merge "Clean up the volume test"

commit 0e90ed6366952535417c4f84364719d0932d73de
Merge: 65b02b2 a057d58
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 18:26:48 2012 +0000

    Merge "Fix Instance unit tests"

commit 65b02b2b3dee01c3022d0fd9bd849a7a9f621222
Merge: 4510ecc 10d23ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 17:08:12 2012 +0000

    Merge "Switch over missed file in version switch"

commit 8bd7e0a8f1b3bd69faf454dd8a779fd5b4d4acbd
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Dec 7 23:18:31 2012 -0500

    Add test to simply run a few binaries
    
    This is not really a unit test, but it's so fast that I think it could
    be considered as such. And it would be nice to gate on such blatant
    breakage.
    
    Change-Id: I8ff4ca27a912c30bd962168418ac44217ea9e54d
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/tests/test_cli.py |   41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

commit 10d23ef1d7babe7b3571c3ee3f953c71bba40144
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Dec 10 11:45:28 2012 -0500

    Switch over missed file in version switch
    
    Bug 1078480
    
    Change-Id: Ic196086467c68bfe718ba6845711da172b237688
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 bin/heat-watch |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 7abb73f36b663818ffb1291f6e6912106377ed79
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 10 14:47:17 2012 +0100

    Don't pass -1 as a stack_id in unit tests
    
    We now use UUIDs as stack IDs, but in most cases even that is not
    necessary.
    
    Change-Id: I0ef4efb5c3289c6c3d0fd3d0232118c0e906f8b5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_autoscaling.py     |    3 +--
 heat/tests/test_dbinstance.py      |    3 +--
 heat/tests/test_eip.py             |    3 +--
 heat/tests/test_instance.py        |    9 +++++----
 heat/tests/test_quantum.py         |    7 +++++--
 heat/tests/test_resource.py        |    3 ++-
 heat/tests/test_s3.py              |    3 +--
 heat/tests/test_template_format.py |    6 +++---
 heat/tests/test_user.py            |    3 +--
 heat/tests/test_vpc.py             |    7 +++++--
 10 files changed, 25 insertions(+), 22 deletions(-)

commit c0a95188a181df75608949729e27e679b83a5272
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 10 17:03:14 2012 +0100

    Make Volume tests independent
    
    Previously, the VolumeAttachment tests relied on stuff left in the database
    by the Volume tests.
    
    Change-Id: I8ff63cb6dac0968e63a83fb5c2f78e2a9024dd7c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_volume.py |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

commit 53d4e6a936f35f9a37bd9687712b89a7d5383079
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 10 15:24:34 2012 +0100

    Clean up the volume test
    
    Various renaming/reformatting done while debugging an issue of the tests
    not being independent.
    
    Change-Id: I65f2f6ba2f5af2f5a233ea15faa62a7e087e2bd1
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_volume.py |  117 ++++++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 64 deletions(-)

commit a057d58c84e12ca33277dea21e7915fdb468460e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Dec 10 14:36:51 2012 +0100

    Fix Instance unit tests
    
    These were all kinds of broken.
    
    Change-Id: Ib219886f5d8e0fea3ee9c71a78b6c7603d1adc98
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_instance.py |   55 ++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

commit 4510eccddc5fbb7fef16a4702112545346d171f3
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Dec 7 16:56:49 2012 -0500

    Add back catch_error which is used for CLI errors
    
    Change-Id: Ib8b975d22950d5ba6aa9d5f150403a64356a8aa3
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/utils.py |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

commit ba5957d0cf28f77d137ac444f0bae918fd084a78
Merge: 3a03a51 4e99d4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 8 02:48:47 2012 +0000

    Merge "Switch to openstack style versioning"

commit 3a03a51df7ea29893ee3a7968c2f8804e358c5a1
Merge: 4259970 14d8a7a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 8 02:46:52 2012 +0000

    Merge "heat-db-setup read engine config file for DB connection details"

commit 4e99d4d0bb4ed4dc6bea9330a63ab53975b3ebf6
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Dec 6 17:15:05 2012 -0500

    Switch to openstack style versioning
    
    Bug 1078480
    
    Change-Id: I32471acc16e7ca6f60672474c9bf70537ba76fd2
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 .gitignore      |    2 +-
 MANIFEST.in     |    1 +
 bin/heat-cfn    |    6 +++---
 heat/version.py |   55 +++----------------------------------------------------
 setup.py        |    6 ++----
 5 files changed, 10 insertions(+), 60 deletions(-)

commit 42599700a75b1b6b4d65707209a08df3ef35b73d
Merge: 4867bd9 ca22f0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 8 01:48:47 2012 +0000

    Merge "Update openstack-common to get newly fixed version.py"

commit ca22f0e44323c511866cf45006cbc8095433444a
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Dec 5 16:44:08 2012 -0500

    Update openstack-common to get newly fixed version.py
    
    Now at oslo-incubator version ea7ced276d2f080718cd89f3a77378cdf24fabf5
    
    Bug 1078480
    
    Change-Id: I0569a1c0b8af42ceb768095d4b852b557b238e61
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/openstack/common/version.py |   32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

commit 14d8a7a19f89bbafe9a5017dbb581051708ce58a
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 7 17:16:04 2012 +0000

    heat-db-setup read engine config file for DB connection details
    
    Currently heat-db-setup, or rather the underlying python -m heat.db.sqlalchemy.manage
    has a hard-coded database connection URL, so DB setup will fail if a non-default
    configuration exists in /etc/heat/heat-engine.conf.
    
    This attempts to read the sql_connection from the DEFAULT section of heat-engine.conf
    falling back to the old default string on failure.
    
    bug/1087741
    
    Change-Id: Ieb41503a58ee0804d79a32a8286268803c9f456c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/db/sqlalchemy/manage.py |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 4867bd965891e5e58877422211420815428295ca
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 17:40:26 2012 +0100

    Don't get nested stacks by name
    
    Don't return nested stacks from stack_get_by_name(). This prevented the
    user creating a stack with the same name as a nested stack, and was a
    temporary workaround for the metadata server (see
    be3c066ab87cc6e1a2ca8c097eeccd9217d7329a)
    
    bug 1072954
    
    Change-Id: I1e3d0289476377f5b4169835119052f4fa573f86
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/sqlalchemy/api.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 0b19eea189e1eddbf1e72a8935dc7a4c42b1deeb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 17:12:41 2012 +0100

    Fix exception handling in AccessKey fetching
    
    bug 1087527
    
    Change-Id: I3de5b27e927ac18aa91f124cd5ef0333c1a83fe2
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/user.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 0c8416537bb26e975b340ae75a0388cf8c0cd712
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 15:38:51 2012 +0100

    Move utils.py to a more appropriate location
    
    It's only used by the database code.
    
    Change-Id: Icd81fdb950b84bcbd365dd80f701a4992f695ea7
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/api.py                |    4 ++--
 heat/db/migration.py          |    2 +-
 heat/db/utils.py              |   41 +++++++++++++++++++++++++++++++++++++++++
 heat/tests/functional/util.py |    1 -
 heat/utils.py                 |   41 -----------------------------------------
 5 files changed, 44 insertions(+), 45 deletions(-)

commit d7437715af4a7b440ab9760e2eb089f4150d5819
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 15:36:54 2012 +0100

    Get rid of leftover heat-jeos code in utils
    
    This code, including the Glance client dependency, was left over from when
    what is now heat-jeos was part of the heat codebase.
    
    Change-Id: I35081fb7911ad1ea3284cbb6e3f83dd8c6a1807f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/utils.py |   55 -------------------------------------------------------
 1 file changed, 55 deletions(-)

commit b06b42455e5440773f9ef24d9cb8d925361766e7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 15:27:58 2012 +0100

    Get rid of pointless cloudformation.py file
    
    Change-Id: Ib75cf51903029f7ba38a48acb62eb35d3ccbb763
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/client.py         |    9 ++++++++-
 heat/cloudformation.py |   21 ---------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

commit c83783b414f93c59961f4cff59964b8b8a459ce3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 15:04:15 2012 +0100

    Get rid of the cfn_helper tests
    
    The code this was testing doesn't even exist any more, so we will always be
    skipping it.
    
    Change-Id: Iac8352094e82ce168e621dc8b9a5833247aa5275
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_cfn.py |  279 ------------------------------------------------
 1 file changed, 279 deletions(-)

commit 019149c06ee602c667677f782ea13a8b56047473
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 15:04:15 2012 +0100

    Enable VPC unit tests
    
    We don't need quantumclient because the tests use a fake client anyway, so
    don't skip the test if it is not installed.
    
    Change-Id: I7cd2447b5a68072d2b43228ab85c53d0124496e5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_vpc.py |   11 -----------
 1 file changed, 11 deletions(-)

commit 705469b5a5a307e48817cae99f5c69e1e977b4f3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 14:55:21 2012 +0100

    Enable Quantum unit tests
    
    We don't need quantumclient because the tests use a fake client anyway, so
    don't skip the test if it is not installed.
    
    Change-Id: Ib350dca6eb8ea27c8b1980eba15b3c9c48738d87
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_quantum.py |   11 -----------
 1 file changed, 11 deletions(-)

commit ab22396cb3a5b317b58cca8938e1d06baeca2edb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Dec 7 12:22:53 2012 +0100

    Get rid of naked except: clauses
    
    The only time it is legitimate to catch all exceptions is when the
    exception is rethrown.
    
    Change-Id: If72243d7a2c73b42de01d2a59514ead76c20d034
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/client.py         |    2 +-
 heat/common/auth.py    |    2 +-
 heat/common/context.py |    2 +-
 heat/common/wsgi.py    |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

commit 07dce8c41e96b8e91a9d81fdef18bbeb648cf41a
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 7 10:20:36 2012 +0000

    heat : Update getting started wiki links
    
    Getting started wiki links need to point to the new wiki
    location on wiki.openstack.org
    
    Change-Id: I2a0e711fc59dcee303b787662dd9ddef0bf344b7
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 docs/GettingStarted.rst |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 10118dd356cbeda524c0f36ff3e7375fad1520ad
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 7 09:48:51 2012 +0000

    heat : Clarify openstack versions for Fedora releases
    
    Update getting started to clarify which versions of openstack are
    expected to work with each Fedora version - I tested F18 alpha and
    things worked OK, so now F18 is beta things should work on F18, and
    I've been running F17+folsom preview for quite a while with no problem
    
    Change-Id: I0610e69ec22ca399cec21bc67f72dc10cb6c4597
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 docs/GettingStarted.rst |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 592f0f3b9964db27705e72febddb4aac5e9e7d0c
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Dec 7 09:39:07 2012 +0000

    heat : Update repositiory in getting started guide
    
    Getting started still points to the old github location
    
    Change-Id: I6437285b0a095e4e0ef25ca065c396a5517192b6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 docs/GettingStarted.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 51f55baf971b8d7cd8077e09a3d34470f1aab8b5
Merge: 7e73e2b ac534da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 7 03:08:28 2012 +0000

    Merge "Add version.py from openstack-common"

commit ac534daf02499e4b6232919972b8210e116f2b92
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Dec 3 17:30:48 2012 -0500

    Add version.py from openstack-common
    
    Bug 1078480
    
    Change-Id: Ia5d4ff63db2907271b8f0ec7fec76ca4cad257d2
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/openstack/common/version.py |  148 ++++++++++++++++++++++++++++++++++++++
 openstack-common.conf            |    2 +-
 2 files changed, 149 insertions(+), 1 deletion(-)

commit 7e73e2bd41b2fb6c87ab8f699548dfdf62c4abe8
Merge: f696b79 97b898b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 6 22:52:25 2012 +0000

    Merge "Update openstack-common"

commit f696b795115f3035cf7ad962697a67ac5a1edf69
Merge: 105ea22 621175e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 6 22:43:33 2012 +0000

    Merge "Do not wrap exceptions during quantum resource delete"

commit 621175e38ba170e499a621a850ef127f6bc39d17
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Dec 7 11:33:16 2012 +1300

    Do not wrap exceptions during quantum resource delete
    
    The stack should go into the DELETE_FAILED state, and a delete
    is attempted on all resources regardless of failures.
    
    Change-Id: Ib707c8112d9053a8627c733f4323f514d30628e9

 heat/engine/resources/quantum/floatingip.py |   14 ++++----------
 heat/engine/resources/quantum/net.py        |    5 +----
 heat/engine/resources/quantum/port.py       |    5 +----
 heat/engine/resources/quantum/router.py     |   21 ++++++---------------
 heat/engine/resources/quantum/subnet.py     |    5 +----
 5 files changed, 13 insertions(+), 37 deletions(-)

commit 97b898b6c7820da9df424b2cef27539139b9514f
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Dec 3 17:31:40 2012 -0500

    Update openstack-common
    
    Now at oslo-incubator version e2fdbd38da576edfd40aeac3956eb48ae1d0e08a
    
    Change-Id: Ie0360fc666718c809cddeb9904af35c929dededd
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/openstack/common/cfg.py           |  146 ++++++++++++++++++++++++++------
 heat/openstack/common/rpc/impl_fake.py |    9 +-
 2 files changed, 126 insertions(+), 29 deletions(-)

commit 105ea22295c3b547e9a7122a7d0e72cd97de342e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 6 20:12:06 2012 +0100

    Use common implementation for fetching templates
    
    bug 1072908
    
    Change-Id: Idad06e8c28cbaed121604bb0de5f79edfacb1efb
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py           |   37 ++++++------------------
 heat/api/openstack/v1/stacks.py     |   53 +++++++++--------------------------
 heat/engine/resources/stack.py      |    5 ++--
 heat/tests/test_api_openstack_v1.py |   11 +++-----
 4 files changed, 29 insertions(+), 77 deletions(-)

commit d7568d08b23488e9651b4fe1fc57815348c4f45c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 6 19:35:05 2012 +0100

    Add a common implementation for fetching a URL
    
    There are multiple implementations of fetching a template from a URL, so
    add a common one where changes can be shared.
    
    Change-Id: I9c834efa71f97360dafb741e26713e3f3c124b6f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/urlfetch.py     |   45 ++++++++++++++++++++++++++
 heat/tests/test_urlfetch.py |   73 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

commit 28ea091448efaeb26839845e4655f5fdd6ff8833
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Dec 6 20:15:27 2012 +0100

    Pass string to template_format.parse()
    
    Since template_format.parse() attempts to guess the type of the input
    instead of using yaml.parse for everything, the input must be a string and
    not a stream, even though yaml.parse() can handle either.
    
    Change-Id: I07dc13a54492f3f6db17bfca3cc9e129c765eed5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/stack.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 842e6cc31da7e060aba9409a91bd46149223d61e
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Dec 6 11:53:45 2012 +1300

    Resource.__eq__ allow resources in different stacks
    
    Doing a stack update was incorrectly replacing identical resources
    because Refs in the new resource were evaluating to None in the new stack.
    
    This change allows an alternative template to be passed to parsed_template
    and modifies __eq__ to compare the two templates in the same stack.
    
    __eq__ now also checks that the name of both resources matches, since a stack
    could have multiple identical resources with different names.
    
    Change-Id: I7e09ee1238dd01490cdfe186c51b7fada9546a63

 heat/engine/resource.py     |   10 ++++++----
 heat/tests/test_resource.py |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

commit 8a3a8d6fe4a8680126a62f90f619da5093c937e4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Dec 5 11:15:42 2012 +0100

    Fix importing of quantum resources subpackage
    
    Apparently pkgutil.walk_packages(path) will return packages outside the
    given path if they have the same names as the ones inside - so having a
    quantum subpackage results in importing the global quantum package from
    Quantum itself instead. Fix this by passing a package prefix to give a
    fully qualified name.
    
    Also make sure that submodules are added as an attribute to their immediate
    parent package, not to some grandparent package with '.'s in the attribute
    name.
    
    bug 1085725
    
    Change-Id: Ie571100898a33ed4fe15d1878c7b16db4caf4fa5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/plugin_loader.py     |   21 ++++++++++++++-------
 heat/tests/test_plugin_loader.py |    5 +++--
 2 files changed, 17 insertions(+), 9 deletions(-)

commit 93688df4404afbf521b70700e92bb77d3259ba41
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Dec 5 14:14:48 2012 +1300

    Do the same install_requires as other projects
    
    This will pull in tools/pip-requires on devstack start
    
    Change-Id: If93319c82a5e3499391e8624582929d4f1adc9ec

 setup.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 7e94df10bb9fbbd16b1f15eaac5df01b77630f1d
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Dec 5 13:58:22 2012 +1300

    Install extras during pip install; fixes devstack
    
    Change-Id: Ia1252d95fa7023d440b293245fe15d2c4ebfc047

 setup.py |    1 +
 1 file changed, 1 insertion(+)

commit c5e64e2e84eba6f8f796063dde6d2d9a2397478c
Merge: 64e35d4 0461e0d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 3 23:11:24 2012 +0000

    Merge "heat getting started, add pip install extras"

commit 64e35d432af48a16485231e61133311fa4518cf1
Merge: c44e852 cfa38e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 3 20:01:14 2012 +0000

    Merge "heat remove unused config options"

commit cfa38e03e8b498df645e5446050b14d5d30df857
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 3 14:53:59 2012 +0000

    heat remove unused config options
    
    Remove metadata* config options - these were actually never used by
    the metadata service, and look to be cut/paste artefacts from the
    nova codebase.
    
    Change-Id: I50b7d48bfaf82d4b1af7ad269ef329ec455c0f04
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/common/config.py |    9 ---------
 1 file changed, 9 deletions(-)

commit 0461e0d41b024c50b96ccccdec5c63b751b22be8
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 3 14:43:14 2012 +0000

    heat getting started, add pip install extras
    
    Add install of extras via pip, as we now depend on it via oslo
    and it's not yet packaged for Fedora
    
    ref bug 1085970
    
    Change-Id: I08f2962e091e0bdb0c9bdc6d25f319e042f858f5
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 docs/GettingStarted.rst |    7 +++++++
 1 file changed, 7 insertions(+)

commit c44e852103af82edee980e3475dbd41939ab459c
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 3 11:06:56 2012 +0000

    heat engine : remove KeystoneClient get_user_by_name
    
    Remove get_user_by_name as it's no longer used, and we want to
    avoid this style of name->id lookup because it requires keystone
    admin role.
    
    Change-Id: I234a235864ac7537df09cae2f07d99ed9d53acd2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/common/heat_keystoneclient.py |   10 ----------
 heat/tests/fakes.py                |    4 ----
 2 files changed, 14 deletions(-)

commit 960a76ba4464423440c9f497bb1126b88fbd1ca8
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Dec 3 11:04:12 2012 +0000

    heat engine : Rework AccessKey to avoid keystone user lookup
    
    Rework the mapping if AccessKey UserName property to keystone
    user_id - the recent refactor reintroduces a keystone.user.list
    call, which requires admin role, which we want to avoid or the
    in-instance user can't request their own secret key via cfn-hup
    
    ref bug 1085049
    
    Change-Id: I456dff67f56336a9052180dc3c59cea8b7a173bd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/resources/user.py |   26 +++++++++++++++++-----
 heat/tests/test_user.py       |   48 +++++++++++++++++++++--------------------
 2 files changed, 46 insertions(+), 28 deletions(-)

commit b938070a1a5f01a7a9d7eca60d8c819910035daf
Merge: a955f61 91e7e3b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 3 04:35:45 2012 +0000

    Merge "Make sure heat uses its own control_exchange"

commit 91e7e3b141adedea01a78fa2819f2b0c7a9069bf
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 3 17:26:34 2012 +1300

    Make sure heat uses its own control_exchange
    
    Due to this recent discussion
    http://lists.openstack.org/pipermail/openstack-dev/2012-November/003578.html
    
    And the commit message in this change
    https://review.openstack.org/#/c/12518/
    
    Change-Id: Icf7ee0475045a3d0a19b8d176162bd7286a39ddc

 heat/common/config.py |    3 +++
 1 file changed, 3 insertions(+)

commit a955f612c348555816887167465083cbeaf10ebe
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Dec 3 15:14:16 2012 +1300

    Make default encryption key long enough for unit tests
    
    Change-Id: Ibef2eabfa50b56c12975222d6073a243bcb0dfef

 heat/common/crypt.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2033ee2b9e1243d14a8c2566501e2828d3e7db5d
Merge: 277118a 89bfe5e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 2 23:15:05 2012 +0000

    Merge "Update the README with more current links"

commit 89bfe5ef5e203502df39c57e7180bc6c174e6226
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Dec 3 10:08:29 2012 +1100

    Update the README with more current links
    
    Change-Id: I14cb327b75053f478b1a0bf1d463488601420390

 README.rst |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

commit 277118a794cde1271f87f5af99961e7eeb054ff6
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 20 16:27:20 2012 +1300

    Add VPC resource implementation
    
    This implements the AWS::EC2::VPC resource.
    
    Change-Id: Ib50897d692292c42b21cffb7d8f6758f2d1a5f1f

 heat/engine/resources/vpc.py |   55 ++++++++++++++++++
 heat/tests/test_vpc.py       |  129 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+)

commit eaa18014339ad48dc0943ee5b4c9b5fc32fb2652
Author: Jeremy Stanley <fungi@yuggoth.org>
Date:   Sun Dec 2 17:44:24 2012 +0000

    Update .gitreview for org move.
    
    * .gitreview: The heat project moved from the heat-api org to
    openstack, so this updates the gerrit remote URL accordingly.
    
    Change-Id: I17051b17e2f319ebd3df5e415a9a9742d5b6704e

 .gitreview |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7d166abe460dda339816554c8e0e677a746e79c6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 16:40:31 2012 +0100

    Use pkgutil to load cloudinit data
    
    Unlike reading from the filesystem, this will allow the data to be read
    even if the package is installed as a gzipped tarball.
    
    Change-Id: I1972f2b6a1b6cee12521480ed774468bb3444780
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/instance.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit aa3ab22520fafca720842b2e98e636b404c8521c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Nov 28 15:19:35 2012 +0100

    Use module names as logger names
    
    Automatically use the current module's __name__ attribute as the name for
    its logger, instead of hardcoding it or (worse) using __path__.
    
    Change-Id: Ic089e0829e5fb93c3debd21e7715ee4c95f84d4c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py                   |    2 +-
 heat/api/cloudwatch/watch.py                |    2 +-
 heat/api/middleware/version_negotiation.py  |    2 +-
 heat/api/openstack/v1/stacks.py             |    2 +-
 heat/db/sqlalchemy/session.py               |    2 +-
 heat/engine/api.py                          |    2 +-
 heat/engine/clients.py                      |    2 +-
 heat/engine/parser.py                       |    2 +-
 heat/engine/resources/autoscaling.py        |    2 +-
 heat/engine/resources/cloud_watch.py        |    2 +-
 heat/engine/resources/dbinstance.py         |    2 +-
 heat/engine/resources/eip.py                |    2 +-
 heat/engine/resources/instance.py           |    2 +-
 heat/engine/resources/loadbalancer.py       |    2 +-
 heat/engine/resources/quantum/floatingip.py |    2 +-
 heat/engine/resources/quantum/net.py        |    2 +-
 heat/engine/resources/quantum/port.py       |    2 +-
 heat/engine/resources/quantum/quantum.py    |    2 +-
 heat/engine/resources/quantum/router.py     |    2 +-
 heat/engine/resources/quantum/subnet.py     |    2 +-
 heat/engine/resources/s3.py                 |    2 +-
 heat/engine/resources/security_group.py     |    2 +-
 heat/engine/resources/stack.py              |    2 +-
 heat/engine/resources/user.py               |    2 +-
 heat/engine/resources/volume.py             |    2 +-
 heat/engine/resources/wait_condition.py     |    2 +-
 heat/engine/watchrule.py                    |    2 +-
 heat/tests/test_waitcondition.py            |    3 ---
 28 files changed, 27 insertions(+), 30 deletions(-)

commit 8083a534fe86ccbf866ecd0be000b2b6b595c0ac
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 10:01:49 2012 +0100

    Add a plugin directory for Resources
    
    bug 1072903
    
    Change-Id: I0f218c47620d50dc52bd931ee266f4dc19d701ed
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/config.py             |    5 ++++-
 heat/engine/resources/__init__.py |    6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

commit 180df199fe33137a403763e0c1a904e3804ceb27
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 10:44:46 2012 +0100

    Automatically register engine options
    
    Register the engine options as soon as we import something from the engine
    package. This means we do not need to explicitly do it in all of the unit
    tests.
    
    Change-Id: I8fb0c8665d0e0255521e21a6aac223ad1e3b1b25
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-engine                     |    3 +--
 heat/engine/__init__.py             |   16 ++++++++++++++++
 heat/tests/test_api_cfn_v1.py       |    2 --
 heat/tests/test_api_cloudwatch.py   |    2 --
 heat/tests/test_api_openstack_v1.py |    2 --
 heat/tests/test_engine_service.py   |    2 --
 heat/tests/test_loadbalancer.py     |    2 --
 heat/tests/test_rpc_client.py       |    2 --
 heat/tests/test_user.py             |    2 --
 heat/tests/test_waitcondition.py    |    3 ---
 10 files changed, 17 insertions(+), 19 deletions(-)

commit 6f31e49f69abf891d0fba3393b01ddd9aba48a37
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 16:35:22 2012 +0100

    Move db crypto code out of the engine
    
    Move it to heat.common instead, and change the module name to better
    reflect what it does.
    
    Change-Id: I14a8cdcea8e16607f10464e07fcab3da4f01fe10
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/crypt.py      |   52 +++++++++++++++++++++++++++++++++++++++++++++
 heat/db/sqlalchemy/api.py |   14 ++++++------
 heat/engine/auth.py       |   52 ---------------------------------------------
 3 files changed, 59 insertions(+), 59 deletions(-)

commit 97135b8f608e8ff64cba5e77384ada4e9fef626c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 11:05:41 2012 +0100

    Create a new heat.rpc package
    
    The definition of the RPC API is common between the engine (server) and the
    clients, so move the client and common definitions out of the heat.engine
    package.
    
    Change-Id: I5fd2ba26f09c86ba1adecab4f9e06e69a694fe90
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py          |    6 +-
 heat/api/cfn/v1/waitcondition.py   |    6 +-
 heat/api/cloudwatch/watch.py       |    6 +-
 heat/api/openstack/v1/events.py    |    6 +-
 heat/api/openstack/v1/resources.py |    6 +-
 heat/api/openstack/v1/stacks.py    |   50 +++----
 heat/engine/api.py                 |  118 +----------------
 heat/engine/rpcapi.py              |  254 ------------------------------------
 heat/engine/watchrule.py           |   13 +-
 heat/rpc/api.py                    |  125 ++++++++++++++++++
 heat/rpc/client.py                 |  254 ++++++++++++++++++++++++++++++++++++
 heat/tests/test_api_cloudwatch.py  |    2 +-
 heat/tests/test_rpc_client.py      |  161 +++++++++++++++++++++++
 heat/tests/test_rpcapi.py          |  161 -----------------------
 14 files changed, 592 insertions(+), 576 deletions(-)

commit cd2fd324a044f8762613793206216cf73617c2ad
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 14:12:38 2012 +0100

    Move template-format parsing code into common
    
    This is used mostly by the API (but also the engine for composed
    templates), so it doesn't belong in the engine package.
    
    Change-Id: I79cf8cc619a6988013a58eb4d46c014c3dcac4a3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py                     |    4 +-
 heat/api/openstack/v1/stacks.py               |    4 +-
 heat/common/template_format.py                |  100 ++++++++++++++++
 heat/engine/format.py                         |  100 ----------------
 heat/engine/parser.py                         |    2 +-
 heat/engine/resources/dbinstance.py           |    4 +-
 heat/engine/resources/loadbalancer.py         |    6 +-
 heat/engine/resources/stack.py                |    4 +-
 heat/tests/functional/test_CFN_API_Actions.py |    4 +-
 heat/tests/functional/util.py                 |    4 +-
 heat/tests/test_autoscaling.py                |    4 +-
 heat/tests/test_dbinstance.py                 |    4 +-
 heat/tests/test_eip.py                        |    4 +-
 heat/tests/test_engine_service.py             |    4 +-
 heat/tests/test_format.py                     |  159 -------------------------
 heat/tests/test_instance.py                   |    6 +-
 heat/tests/test_loadbalancer.py               |    6 +-
 heat/tests/test_parser.py                     |    4 +-
 heat/tests/test_quantum.py                    |    4 +-
 heat/tests/test_s3.py                         |    4 +-
 heat/tests/test_template_format.py            |  159 +++++++++++++++++++++++++
 heat/tests/test_user.py                       |    4 +-
 heat/tests/test_validate.py                   |   14 +--
 heat/tests/test_volume.py                     |    4 +-
 heat/tests/test_waitcondition.py              |    8 +-
 tools/cfn-json2yaml                           |    6 +-
 26 files changed, 313 insertions(+), 313 deletions(-)

commit b35cc6d06e9d744134197591e890e3d0ec8af3e5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 11:38:44 2012 +0100

    Move the identifier module into heat.common
    
    It is used by both the engine and the client APIs, so it doesn't belong in
    the engine.
    
    Change-Id: I45306fd8293d1d859fde5fda9cdcf5fb0588aa2d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py           |    2 +-
 heat/api/openstack/v1/events.py     |    2 +-
 heat/api/openstack/v1/resources.py  |    2 +-
 heat/api/openstack/v1/util.py       |    2 +-
 heat/common/identifier.py           |  204 +++++++++++++++++++++++++++++++++++
 heat/engine/event.py                |    2 +-
 heat/engine/identifier.py           |  204 -----------------------------------
 heat/engine/parser.py               |    2 +-
 heat/engine/resource.py             |    2 +-
 heat/engine/service.py              |    2 +-
 heat/tests/test_api_cfn_v1.py       |    2 +-
 heat/tests/test_api_openstack_v1.py |    2 +-
 heat/tests/test_identifier.py       |    2 +-
 13 files changed, 215 insertions(+), 215 deletions(-)

commit 07b312329eb1fbd90ff91970d8ebbbb4a1df211b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 15:57:48 2012 +0100

    Remove gen(erate)_uuid from heat.common.utils
    
    We now use the version from openstack-common.
    
    Change-Id: I0ff86c73f2de1fa6e2455e2c59d1e5859634d1e9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/utils.py |    9 ---------
 1 file changed, 9 deletions(-)

commit 61303fb7770af94f8d56e2ad527eb0247901dd63
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 15:59:23 2012 +0100

    Remove is_uuid() from HeatIdentifier class
    
    We now use the equivalent functionality from openstack-common.
    
    Change-Id: I915cdb92b89d3548fa03e1820d8b90b2aac4e44b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/identifier.py     |   10 ----------
 heat/tests/test_identifier.py |   12 ------------
 2 files changed, 22 deletions(-)

commit c985e7996037e52894e467a6512b6c0d6ea98113
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 15:47:56 2012 +0100

    Use uuidutils from openstack-common
    
    Change-Id: I6fdd1bf59562a3dbef96da8d30c2733a801acd58
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/context.py                             |    4 ++--
 .../migrate_repo/versions/012_stack_id_uuid.py     |    4 ++--
 heat/db/sqlalchemy/models.py                       |    4 ++--
 heat/engine/service.py                             |    3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

commit 04fe836b82d70a9e3932debf1fbdd4af8efa4cc5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 14:56:06 2012 +0100

    Add uuidutils from openstack-common
    
    Change-Id: Ia4a8e18f9a2383c09bdd9d59af3df8c057c8d35e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/openstack/common/uuidutils.py |   39 ++++++++++++++++++++++++++++++++++++
 openstack-common.conf              |    2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

commit b3e5647339105883d178470a7700700199c13772
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 30 14:54:07 2012 +0100

    Update openstack-common
    
    Now at oslo-incubator version 1fd7694e96da4c7e461d3c966fab1e81ee57c315
    
    Change-Id: If6ca594185cdaf6f2b279185cb4a4f62391aa828
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/openstack/common/cfg.py                   |  353 +++++++++++++-----------
 heat/openstack/common/eventlet_backdoor.py     |   10 +-
 heat/openstack/common/exception.py             |    4 +-
 heat/openstack/common/excutils.py              |    6 +-
 heat/openstack/common/importutils.py           |    2 +-
 heat/openstack/common/jsonutils.py             |    2 +-
 heat/openstack/common/log.py                   |    4 +-
 heat/openstack/common/loopingcall.py           |    9 +-
 heat/openstack/common/notifier/api.py          |    7 +-
 heat/openstack/common/notifier/rpc_notifier.py |   46 +++
 heat/openstack/common/rpc/amqp.py              |   13 +-
 heat/openstack/common/rpc/common.py            |    6 +-
 heat/openstack/common/rpc/dispatcher.py        |   10 +-
 heat/openstack/common/rpc/impl_qpid.py         |   25 +-
 heat/openstack/common/rpc/matchmaker.py        |    2 +-
 heat/openstack/common/rpc/service.py           |    5 +
 heat/openstack/common/service.py               |   33 +--
 heat/openstack/common/threadgroup.py           |   25 +-
 heat/openstack/common/timeutils.py             |   29 +-
 heat/openstack/common/utils.py                 |   13 +-
 tools/pip-requires                             |    2 +
 21 files changed, 361 insertions(+), 245 deletions(-)

commit 6ae3ff0a4e8503acd6ceddbe87878c0d3cdfe9bd
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 28 15:50:41 2012 +0000

    Remove heat-metadata service
    
    Remove heat-metadata service, since the last remaining function
    (waitcondition handle notification) is now handled via the CFN
    API
    
    blueprint metsrv-remove
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: Ie36c86ce86f6c47e8d9f8accf8ec17084fb8cffd

 bin/heat-metadata                |   61 ------------------------------
 docs/GettingStarted.rst          |   27 ++++----------
 etc/heat/heat-metadata-paste.ini |   15 --------
 etc/heat/heat-metadata.conf      |   27 --------------
 heat/common/config.py            |    6 ---
 heat/metadata/api/v1/__init__.py |   46 -----------------------
 heat/metadata/api/v1/metadata.py |   76 --------------------------------------
 setup.py                         |    1 -
 8 files changed, 8 insertions(+), 251 deletions(-)

commit 6689711bfd59a15f04802503dc596a6ff2998baf
Merge: 3eeeeba 17dd71b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 29 22:35:11 2012 +0000

    Merge "heat engine : Convert WaitConditionHandle to pre-signed URLs"

commit 3eeeebaaaa94c9bcfb9750e50e0905be842069a7
Merge: 658a839 d4bb435
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 29 22:31:18 2012 +0000

    Merge "heat engine : subclass keystone client to encapsulate common code"

commit 17dd71b01775430b8dbc5c3b2ced65a11fd647e1
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 26 11:26:00 2012 +0000

    heat engine : Convert WaitConditionHandle to pre-signed URLs
    
    Change WaitConditionHandle so it provides a pre-signed URL which
    allows authenticated wait condition notification via the CFN API
    
    blueprint metsrv-remove
    Change-Id: I5c1c3a17ade35c810e49b1f27d80bcfea9e89485
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 etc/heat/heat-engine.conf               |    4 +-
 heat/common/ec2signer.py                |  105 +++++++++++++++++++++++++++++++
 heat/engine/resources/wait_condition.py |   71 +++++++++++++++++++--
 heat/tests/test_waitcondition.py        |  100 +++++++++++++++++++++++++++--
 4 files changed, 267 insertions(+), 13 deletions(-)

commit d4bb435ed2baa143c1b9affccd958957b8c74f30
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 23 10:41:03 2012 +0000

    heat engine : subclass keystone client to encapsulate common code
    
    Encapsulate the keystone client in a heat-specific wrapper subclass
    so we can put heat-specific implementation related to keystone in
    one place.  This will allow easier reuse of common code between
    resources which need to manipulate stack users and ec2 keys
    
    blueprint metsrv-remove
    Change-Id: I3d9751023c52cb75ab5e1f62415b1db4e4361dec
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/common/heat_keystoneclient.py |  159 ++++++++++++++++++++++++++++++++++++
 heat/engine/clients.py             |   27 +-----
 heat/engine/resources/user.py      |  133 ++++++++----------------------
 heat/tests/fakes.py                |   36 ++++++++
 heat/tests/test_user.py            |   99 ++++------------------
 5 files changed, 250 insertions(+), 204 deletions(-)

commit 658a839665f78dd19804917774e3d175265628bd
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 29 20:51:01 2012 +0100

    Process engine config before initialisation
    
    Don't import the heat-engine service module until the configuration options
    have been initialised. This will allow us to read the configuration during
    initialisation of the engine.
    
    Change-Id: I2bc70d903434eac1fa248640018f038c5ef2bead
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-engine |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 89714b36d444e564b14640e6b4d5b82b6c0912b6
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Nov 22 17:11:15 2012 +0000

    heat api : add waitcondition to cfn api
    
    Add a new path to the CFN api, which implements CFN style waitcondition
    notification - this means we can move away from the separate heat-metadata
    service for this purpose, instead using the authenticated CFN API
    
    blueprint metsrv-remove
    Change-Id: I62cff7cb4c7a009fea2c8f62ea446d8d758f5429
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/cfn/v1/__init__.py      |   10 ++++++
 heat/api/cfn/v1/waitcondition.py |   71 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

commit 38100845aaa27ba1a0d08553944a0bd96e9c41cf
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 29 12:50:48 2012 +0100

    Add documentation on plugin_loader module
    
    Change-Id: I55a6c90c8bacee8a3bfed297b150cf5554cfabba
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/plugin_loader.py |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit b6711c12e3dd8b7f8dbf8c654379e0d8fa8912d2
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 15:13:55 2012 +0100

    Lookup the class for an Instance in Autoscaling
    
    Instead of hardcoding the class for handling instances in autoscaling,
    look up the class for the AWS::EC2::Instance resource type using the same
    mechanism used for creating resources normally.
    
    Change-Id: I37b9aff9a83b89cdc782467720970a04549d7b1e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/autoscaling.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 4b6f1b8ad0ce6490927d4de6d922e2ffc915fef4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 16:36:50 2012 +0100

    Refactor autoscaling Instance creation
    
    Change-Id: I5d545500f1bc71222ce2c599f57d2d373990da73
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/autoscaling.py |   25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

commit b487adbf8b52485bd804a3713235453bdbcf4cd7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 16:15:56 2012 +0100

    Load resources dynamically
    
    Automatically load all resources as "plugins" when importing the package
    heat.engine.resources, instead of having to list them explicitly.
    
    Change-Id: I9d11ab9a5b1dd21bc5f9c2f0aad95c035a9c9aa0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resource.py           |   19 +++++++++--
 heat/engine/resources/__init__.py |   34 +++++++++++++++++++
 heat/engine/resources/register.py |   67 -------------------------------------
 heat/engine/service.py            |    1 +
 4 files changed, 52 insertions(+), 69 deletions(-)

commit faca9953c0d412944a23dfbc62e5634a509c51e8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 15:41:57 2012 +0100

    Add a module for dynamically loading plugins
    
    Change-Id: I662b5989941b467c78a392098db0cd19ff86201c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/plugin_loader.py     |   64 ++++++++++++++++++++++++++++++++++
 heat/tests/test_plugin_loader.py |   70 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+)

commit a0cf5dfa5c7eb070ee6aefcdfb23c04ece7c0b70
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 27 15:38:44 2012 +0100

    Distribute resource mapping to individual modules
    
    Define the mapping from resource names to classes locally in each module
    and then aggregate them. This moves the mappings near the definitions, and
    provides the format for an eventual plug-in resource architecture.
    
    Change-Id: I3e70d495c5a490ae20d38bf1aec7e28080a55520
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/autoscaling.py        |    8 ++++
 heat/engine/resources/cloud_watch.py        |    6 +++
 heat/engine/resources/dbinstance.py         |    6 +++
 heat/engine/resources/eip.py                |    7 ++++
 heat/engine/resources/instance.py           |    7 ++++
 heat/engine/resources/loadbalancer.py       |    6 +++
 heat/engine/resources/quantum/floatingip.py |    7 ++++
 heat/engine/resources/quantum/net.py        |    6 +++
 heat/engine/resources/quantum/port.py       |    6 +++
 heat/engine/resources/quantum/router.py     |    8 ++++
 heat/engine/resources/quantum/subnet.py     |    6 +++
 heat/engine/resources/register.py           |   55 ++++++++++++---------------
 heat/engine/resources/s3.py                 |    6 +++
 heat/engine/resources/security_group.py     |    6 +++
 heat/engine/resources/stack.py              |    6 +++
 heat/engine/resources/user.py               |    7 ++++
 heat/engine/resources/volume.py             |    7 ++++
 heat/engine/resources/wait_condition.py     |    7 ++++
 18 files changed, 137 insertions(+), 30 deletions(-)

commit b0026981a5855ec0a9427f7787570d4de903512d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Nov 28 14:43:40 2012 +0100

    Move the resource module out of the resources package
    
    Leave only the actual resource implementations in the heat.engine.resources
    package. This is the first step to implementing a plugin-style architecture
    for resources.
    
    Change-Id: I8a63da4f54b087ee792969678f92da8e31787a3e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/event.py                     |   96 +++++++
 heat/engine/parser.py                    |    4 +-
 heat/engine/properties.py                |  195 ++++++++++++++
 heat/engine/resource.py                  |  404 ++++++++++++++++++++++++++++++
 heat/engine/resources/__init__.py        |    2 -
 heat/engine/resources/autoscaling.py     |    2 +-
 heat/engine/resources/cloud_watch.py     |    2 +-
 heat/engine/resources/eip.py             |    2 +-
 heat/engine/resources/event.py           |   96 -------
 heat/engine/resources/instance.py        |    2 +-
 heat/engine/resources/properties.py      |  195 --------------
 heat/engine/resources/quantum/quantum.py |    2 +-
 heat/engine/resources/resource.py        |  404 ------------------------------
 heat/engine/resources/s3.py              |    2 +-
 heat/engine/resources/security_group.py  |    2 +-
 heat/engine/resources/stack.py           |    2 +-
 heat/engine/resources/user.py            |    2 +-
 heat/engine/resources/volume.py          |    2 +-
 heat/engine/resources/wait_condition.py  |    2 +-
 heat/engine/service.py                   |    2 +-
 heat/tests/test_event.py                 |    4 +-
 heat/tests/test_loadbalancer.py          |    2 +-
 heat/tests/test_parser.py                |    2 +-
 heat/tests/test_properties.py            |    2 +-
 heat/tests/test_quantum.py               |    2 +-
 heat/tests/test_resource.py              |    2 +-
 26 files changed, 716 insertions(+), 718 deletions(-)

commit 965618ac42b0b62c3c836ba02120674fe763c07d
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 27 15:23:40 2012 +1300

    Remove YAML template trailing spaces
    
    Change-Id: I36ae27a44bd9863df63bdff144f1773c774661b4

 templates/Quantum.yaml                   |   20 ++++++++++----------
 templates/WordPress_Single_Instance.yaml |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

commit 9058be757fbd64267bbd9a4dfb9864a7da5857d5
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 13:07:51 2012 +1300

    Convert some existing templates to YAML format.
    
    This is the result of running:
    python tools/cfn-json2yaml templates/
    and then cleaning up by hand to be more consistant, readable and
    maintainable.
    
    The following templates are enforced to parse to identical stacks
    in the unit tests so any fundamental change to one must be made
    to the other.
    
    Quantum.template
    Quantum.yaml
    
    WordPress_Single_Instance.template
    WordPress_Single_Instance.yaml
    
    Change-Id: Ibe05a5c5a7a5bb1861c5f84a3dc41e2d632852fd

 heat/tests/test_format.py                |   63 ++++++++++++++
 templates/Quantum.yaml                   |   72 ++++++++++++++++
 templates/WordPress_Single_Instance.yaml |  135 ++++++++++++++++++++++++++++++
 3 files changed, 270 insertions(+)

commit b10898a7a277cf4ca107c5641f6fde88f5ae5636
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 27 13:50:20 2012 +1300

    For Fn::Join join strings in resolve_static_data
    
    Fn::Join now has some preprocessing in resolve_static_data
    where contiguous strings are joined into a single string.
    
    This will allow equivalence tests to pass when comparing
    JSON templates to hand-tidied YAML
    
    Change-Id: I49fb2456388b3fd554ccec00920d7e84f6998183

 heat/engine/parser.py     |    3 ++-
 heat/engine/template.py   |   31 +++++++++++++++++++++++++++++++
 heat/tests/test_parser.py |   24 +++++++++++++++++++-----
 3 files changed, 52 insertions(+), 6 deletions(-)

commit 0f1a11473c37cd6253dbbca45dbc1813816e7bbc
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 27 12:48:05 2012 +1300

    Set default empty dicts for missing sections
    
    So that the YAML format can be more terse, make empty version and
    sections imply the lastest version and an empty dict for the
    section content.
    
    Change-Id: Ic8b86065534930852fff1488849dbbbbb6b85243

 heat/engine/format.py               |   36 ++++++++++++++++++++++++++++++-----
 heat/tests/test_api_openstack_v1.py |   10 +++++++++-
 heat/tests/test_format.py           |   25 +++++++++++++++++++++++-
 3 files changed, 64 insertions(+), 7 deletions(-)

commit c55a2ea232a9bdca8d4d75b513772f109d0dffd0
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 13:52:34 2012 +1300

    Don't assume parsed JSON in REST API.
    
    This checks to see if the 'template' attribute is a dict.
    
    If not it uses format.parse_to_template to parse it.
    Change-Id: Ic9b9ef3e88a33a93d5896277cc3d4da4fd55fc25

 heat/api/openstack/v1/stacks.py     |   24 +++++++++++++++---------
 heat/tests/test_api_openstack_v1.py |   25 ++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 14 deletions(-)

commit f1e77c0a658bd3eaf152583f55f75e77f3533650
Merge: 549d26f 11d026d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 26 19:28:14 2012 +0000

    Merge "pip-requires fix boto version"

commit 549d26feb26ac1ffd6ecb8bfedfa4e7d4e1f4eb5
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 26 18:14:16 2012 +0000

    cfn-json2yaml file-mode bugfix
    
    file-mode wasn't working, also add missing header
    
    Change-Id: I75d15fd73de4ab3ce679ae3a274ec1c402802267
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/cfn-json2yaml |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

commit 11d026dd95c17267ebfb0722920d356441522276
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 26 13:51:03 2012 +0000

    pip-requires fix boto version
    
    Boto version added to pip-requires is wrong - we need a version containing
    the commit discussed under https://github.com/boto/boto/pull/742, which is
    only included in boto>=2.4.0
    
    Change-Id: Iaaa61f306d4035e63ca3f7a0eafe2d5715585f16
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 87e56e36167e810ca15be825df5a5e1537934f6b
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 23 08:15:15 2012 +1300

    Utility to convert JSON template files to YAML
    
    Accepts a directory or file path.
    
    Change-Id: Icd51db5484283372a2b5fb8c681b0e88c7a9c1d5

 tools/cfn-json2yaml |   36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

commit 9b05e2429ff70bea4380da9d1ab2e8c8c64d00da
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 13:04:35 2012 +1300

    For tests, Parse all templates with parse_to_template
    
    Change-Id: Iedb6929f46dddbb888a7248034864855b5cd0205

 heat/tests/functional/test_CFN_API_Actions.py |    4 +++-
 heat/tests/functional/util.py                 |    3 ++-
 heat/tests/test_autoscaling.py                |    3 ++-
 heat/tests/test_dbinstance.py                 |    3 ++-
 heat/tests/test_eip.py                        |    3 ++-
 heat/tests/test_engine_service.py             |    3 ++-
 heat/tests/test_instance.py                   |    5 +++--
 heat/tests/test_loadbalancer.py               |    5 +++--
 heat/tests/test_parser.py                     |    3 ++-
 heat/tests/test_quantum.py                    |    3 ++-
 heat/tests/test_s3.py                         |    3 ++-
 heat/tests/test_user.py                       |    3 ++-
 heat/tests/test_validate.py                   |   13 +++++++------
 heat/tests/test_volume.py                     |    3 ++-
 heat/tests/test_waitcondition.py              |    5 +++--
 15 files changed, 39 insertions(+), 23 deletions(-)

commit 94784dd8f77bd863cc8d3f74da4e3bba55db7a05
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 13:01:11 2012 +1300

    Parse all templates with format.parse_to_template
    
    It can no longer be assumed that a template string is in JSON format.
    
    Change-Id: Id43b82a25e62f7c7868c1c51556c5bde94e7b132

 heat/api/cfn/v1/stacks.py             |    3 ++-
 heat/engine/parser.py                 |    2 +-
 heat/engine/resources/dbinstance.py   |    6 ++----
 heat/engine/resources/loadbalancer.py |    7 +++----
 heat/engine/resources/stack.py        |    3 ++-
 5 files changed, 10 insertions(+), 11 deletions(-)

commit f1c762b110100903121e13afc7870737161d2828
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 12:52:47 2012 +1300

    Module for converting JSON to YAML, and parsing both
    
    convert_json_to_yaml is a utility function used for tests and file conversion
    utilities.
    
    parse_to_template will take any string, infer the format, and parse to a
    python structure. Currently it assumes the file is JSON if it starts with '{'
    otherwise it attempts to parse it as YAML.
    
    Change-Id: If15ccdaf912693f76b74bb1fe879145af1cb36b1

 heat/engine/format.py     |   74 +++++++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_format.py |   73 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+)

commit 60531b4ca53379a7cb0124d47ce2028e3d475e94
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 26 14:34:38 2012 +1300

    Add packages and versions in response to grizzly-1
    
    - Paste is now PasteDeploy
    - boto is now an explicit requirement
    - python-glanceclient replaces removed glance client
    - added PyYAML for new YAML format
    
    Change-Id: I59e11a45f7cc77007e259e5dd1b216e691c5f116

 tools/pip-requires |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 1b2a2d7d7ee5ff522f8880311cf2a7106bb1dbe2
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Nov 22 21:17:13 2012 -0800

    HAProxy example had incorrect descriptions
    
    Change-Id: Ibc14297159e6e0c0b159d214539a5030d4af573e

 templates/HAProxy_Single_Instance.template |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit cbef4bef028df3d5868e98ae2c55e9dd88149ef0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:57 2012 +0100

    ReST API: Add Events
    
    Change-Id: I716dc2ad1c9294a7a9df27fbb77e32926b1ba307
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/api.md                         |   63 ++++++
 heat/api/openstack/v1/__init__.py   |   27 ++-
 heat/api/openstack/v1/events.py     |  132 ++++++++++++
 heat/tests/test_api_openstack_v1.py |  402 +++++++++++++++++++++++++++++++++++
 4 files changed, 623 insertions(+), 1 deletion(-)

commit f454e5ac3ac593711f370faec1ace83004592311
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 14:09:56 2012 +0100

    CFN API: Rename ID formatting method
    
    It now formats event IDs as well as stack IDs.
    
    Change-Id: Iec288eec68cbbebd911a4cf5bfdad96c20dc60f0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py     |   13 +++++++------
 heat/tests/test_api_cfn_v1.py |    2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

commit a5cef837fdfff5963a1c2ef5ee5fdc7367299db5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:57 2012 +0100

    RPC API: Return an identifier for events
    
    Change-Id: Iae2f08014e28997e499771ba9d89feb3954540da
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/cfn/v1/stacks.py         |    7 +++++--
 heat/engine/api.py                |    4 ++--
 heat/tests/test_api_cfn_v1.py     |    9 +++++++--
 heat/tests/test_engine_service.py |    5 +++--
 4 files changed, 17 insertions(+), 8 deletions(-)

commit 7054f55824ec51032ef1c989b024103536028548
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:57 2012 +0100

    Use the new class for database access to Events
    
    Change-Id: I6c02cf47869aaa1d293cb1b528ed967397c47208
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/api.py                |   19 ++++++++++---------
 heat/engine/resources/resource.py |   16 ++++++----------
 heat/engine/service.py            |    5 ++++-
 3 files changed, 20 insertions(+), 20 deletions(-)

commit 7867fe23510e170efdeb2f8644c81a09c53bf1e7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:57 2012 +0100

    Add a class to represent Events
    
    Change-Id: Ie360343a264f2348af518c8f8eb8cfa0763ad18c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/event.py |   96 ++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_event.py       |   96 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 192 insertions(+)

commit 248d87801188cfcc464f8f1b4503cf3d2be18b28
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:57 2012 +0100

    Add a method for querying a resource's type
    
    Change-Id: Ie07a01668c5958494631806ffc0748f659eb8a1b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/resource.py |   11 ++++++-----
 heat/tests/test_resource.py       |    5 +++++
 2 files changed, 11 insertions(+), 5 deletions(-)

commit ab71a7e0aa5665e8c34d3d6311ffd3e3d2207608
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:56 2012 +0100

    Add identifiers for Events
    
    Change-Id: I54b2d2bb56129314218f36889f0f525e88c9f146
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/identifier.py     |   45 +++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_identifier.py |   35 ++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

commit fada8b3b938c5f4b8107adfeef3c8b8b0a0c4702
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Nov 22 11:06:56 2012 +0100

    Improve the identifier class for Resources
    
    Enable the resource name to be retrieved from an object. Also allow a
    ResourceIdentifier to be constructed from only the data passed through the
    RPC API. This means we can use a single format for identifiers, but still
    be able to extract important information such as the stack identifier and
    resource name.
    
    Change-Id: Ie9122cb1a835b30eb8e0713a9d5cdcb4a386eda7
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/resources.py  |    2 +-
 heat/engine/identifier.py           |   49 ++++++++++++++++++++++++++---------
 heat/engine/resources/resource.py   |    4 +--
 heat/tests/test_api_openstack_v1.py |   20 +++++++-------
 heat/tests/test_identifier.py       |   24 ++++++++++++++---
 5 files changed, 71 insertions(+), 28 deletions(-)

commit 18010f923b3860a16f2da485d5ac6380badec9e0
Merge: e973659 67f4f60
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 21 19:46:31 2012 +0000

    Merge "Get db session from the context."

commit e973659c743579db093ddac7aaab778773b6cd10
Merge: ddd5a10 b1787bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 21 19:31:19 2012 +0000

    Merge "Use a real context for tests."

commit 67f4f608153048ec3cb566d63d4df7b1d7fe05e4
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 22 08:15:05 2012 +1300

    Get db session from the context.
    
    The aim is to use a single sqlalchemy session for an RPC request.
    
    The context object passed to EngineAPI methods is actually an RpcContext
    which contains the same data as the RequestContext. The @request_context
    decorator turns this back into a RequestContext which can now have other
    behaviours added to it.
    
    RequestContext now has a lazy loaded session attribute.
    
    Save calls on created entities need to be passed the shared session.
    
    Change-Id: Ied4e66deaca205362b84fb698f75cc872886607d

 heat/common/context.py            |    8 ++++++++
 heat/db/api.py                    |    4 ++++
 heat/db/sqlalchemy/api.py         |   33 +++++++++++++++++----------------
 heat/engine/parser.py             |    4 ++--
 heat/engine/resources/resource.py |    2 +-
 heat/engine/service.py            |   27 +++++++++++++++++++++++++++
 6 files changed, 59 insertions(+), 19 deletions(-)

commit b1787bd43e6c7a56523d0bc246008815fb508454
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 22 08:13:33 2012 +1300

    Use a real context for tests.
    
    No more DummyContext.
    
    Change-Id: Ifbb7cea17b9fa0df90c15867712a74f4d8a5115d

 heat/tests/test_autoscaling.py |   13 +++++++------
 heat/tests/test_dbinstance.py  |   15 ++++++++-------
 heat/tests/test_eip.py         |   13 +++++++------
 heat/tests/test_quantum.py     |   13 +++++++------
 heat/tests/test_s3.py          |   13 +++++++------
 heat/tests/test_user.py        |   13 +++++++------
 heat/tests/test_volume.py      |   13 +++++++------
 7 files changed, 50 insertions(+), 43 deletions(-)

commit ddd5a10f3771e0cef4c7f48faa9012a8b1d2d3f2
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 21 11:34:51 2012 +0000

    heat engine retrieve credentials every periodic task interval
    
    Avoid saving a session context, instead retrieve the DB stored
    credentials for every periodic task trigger, and create a new
    session context for each periodic event
    
    Change-Id: I24ca70b478f06be26ca6cc74385b37d1a0cf098d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/service.py |   32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

commit ee9e31fb1fd502ed0ddee74d6f41b65a7e6ecf91
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 21 11:31:14 2012 +0000

    heat engine Add admin flag to dbapi stack_get
    
    Add a flag to the stack_get dbapi call, defaulted to False,
    which allows us to specify that the admin context is being used
    hence we don't want tenant-scoping condition applied.
    This is needed to allow the admin context to retrieve stored
    credentials per-stack (e.g for the periodic per-stack tasks)
    
    Change-Id: I55e307b7940f7da13bd169271744e80d95ea0bd9
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/db/api.py            |    4 ++--
 heat/db/sqlalchemy/api.py |    7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

commit 66ef27527d7765c2d6b3898a11425c58ec69911c
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 20 16:24:23 2012 +1300

    Tool to download all Amazon example templates
    
    Templates are saved in templates/cloudformation-examples which is ignored
    by git.
    
    Its probably time we're exposed to a bit more template diversity.
    
    Change-Id: I667c4f08fced353201ab9234a51526bcbeb0761b

 .gitignore                          |    2 ++
 tools/fetch-cloudformation-examples |   48 +++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

commit 879d813efc45a4c07fc99a3c53941cfb9768dd4d
Merge: 339ca7b 34c1b9c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 22:57:31 2012 +0000

    Merge "heat engine allow WatchRule load() from DB object"

commit 339ca7bf068900be81489f06e91624fc8b055fea
Merge: 19ac89d d89f6c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 22:55:30 2012 +0000

    Merge "heat engine move to per-stack periodic watch threads"

commit 19ac89dd72b225a66de0f779651ad2099a731991
Merge: cc8b423 1563f30
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 22:54:53 2012 +0000

    Merge "add watch_rule_get_all_by_stack dbapi call"

commit cc8b423f56ffac8e94ce47b7fd2d4bd6ea65cc35
Merge: bb8298d f96f15d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 22:52:49 2012 +0000

    Merge "Make CloudWatchAlarm names unique per-tenant"

commit bb8298d316fd79f867788bf9c0254e3855952d61
Merge: 1f5fac7 deffe8a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 22:51:58 2012 +0000

    Merge "WatchRule refer to stack by id not name"

commit 1f5fac70558d2ca440b04a88b5a1e1e9d740c504
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 15:18:54 2012 +1100

    r1 not defined
    
    Change-Id: Icd1135f17512248d5c212ba88add386212510641

 heat/api/openstack/v1/stacks.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ab302c9ed8be1753d1e41a593eeabee5e3fffd16
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 15:08:53 2012 +1100

    Remove unused statements/local assignments
    
    Change-Id: Iabc1932ef4f851567c30719de127e1165f23dd90

 heat/api/cfn/v1/stacks.py         |   13 -------------
 heat/api/cloudwatch/watch.py      |    6 +++---
 heat/common/wsgi.py               |    1 -
 heat/engine/resources/instance.py |    1 -
 4 files changed, 3 insertions(+), 18 deletions(-)

commit 34c1b9cc334dc3c67c773dffc188413296fde92f
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 19 22:23:24 2012 +0000

    heat engine allow WatchRule load() from DB object
    
    Allow WatchRule.load to initialize an object based on an existing
    sqlalchemy DB object, similar to parser.Stack, avoids doing two
    DB lookups when running the periodic watch tasks
    
    Change-Id: I280942b81e5fdee17acf5582e3d319045afa7914
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/service.py   |    7 +++----
 heat/engine/watchrule.py |   32 ++++++++++++++++----------------
 2 files changed, 19 insertions(+), 20 deletions(-)

commit d89f6c0ba1c0da0bbd42e08b44cfd74e412d2143
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 19 16:55:23 2012 +0000

    heat engine move to per-stack periodic watch threads
    
    Use the stack thread groups, so a separate watch thread is started
    for each stack - this avoids some of the context scoping problems
    previously encountered since we can pass the correct context to the
    periodic task when starting it
    
    Fixes bug 1078779
    
    Change-Id: I56e6a4b126199587e91548f450956d77ab2158f3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/service.py            |   53 +++++++++++++++++++++++++++++++++----
 heat/engine/watchrule.py          |   25 +++--------------
 heat/tests/test_engine_service.py |    4 +++
 3 files changed, 55 insertions(+), 27 deletions(-)

commit 1563f3039f3335d53891da055dcbb2b2334a234f
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 19 16:26:12 2012 +0000

    add watch_rule_get_all_by_stack dbapi call
    
    Add option to retrieve all watch rules for a given stack, which
    will be required to move to periodic watch threads per-stack
    
    Ref bug 1078779
    
    Change-Id: I350e2ee72c7eec0b91bf85ac52bb04e3cd00b4db
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/db/api.py            |    4 ++++
 heat/db/sqlalchemy/api.py |    6 ++++++
 2 files changed, 10 insertions(+)

commit f96f15d2edb379d93c999f8d92f1d636ab87910e
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 19 15:31:01 2012 +0000

    Make CloudWatchAlarm names unique per-tenant
    
    Use physical_resource_name to ensure CloudWatchAlarm resources
    are unique per tenant
    
    Ref bug 1078779
    
    Change-Id: Id37393decd8d4f89e79af5c7e9eeb21f4e494699
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/resources/cloud_watch.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit deffe8a1679b2fd0af803de9fa3aee46d41d5d84
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Nov 14 15:41:17 2012 +0000

    WatchRule refer to stack by id not name
    
    Rework WatchRule to refer to stacks by uuid not name, this will
    help us move to allowing non-unique stack names containing WatchRule
    resources
    
    Ref bug 1078779
    
    Change-Id: Idbbbd65a05d7036860cc2feb044d568210071d21
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/cloudwatch/watch.py                       |    8 +--
 .../migrate_repo/versions/014_watch_stackid.py     |   25 ++++++++
 heat/db/sqlalchemy/models.py                       |    5 +-
 heat/engine/api.py                                 |    6 +-
 heat/engine/resources/cloud_watch.py               |    2 +-
 heat/engine/watchrule.py                           |   23 +++----
 heat/tests/test_api_cloudwatch.py                  |   14 +++--
 heat/tests/test_engine_service.py                  |   46 ++++++++++++--
 heat/tests/test_loadbalancer.py                    |   27 +++++---
 heat/tests/test_watch.py                           |   65 +++++++++++++-------
 10 files changed, 158 insertions(+), 63 deletions(-)

commit 90b747061c7bf8efe624eeb7842789ac98a45709
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Nov 19 12:10:12 2012 -0500

    Provide more information with template URL error
    
    Previously a generic read error was given. Inform the user with proper
    exceptions for: the case when a resource is present but non-responsive
    and when a resource is present but the requested data could not be
    found.
    
    Fixes bug 1072951
    
    Change-Id: I35b92cea38358691015f8752e80efc6720e34e48
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/api/cfn/v1/stacks.py |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

commit 05a90503228f829f73bd1017b530a28cefa1a0d4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 15:05:42 2012 +1100

    Add missing logging imports
    
    Change-Id: Ide1d0a27337bfaf767cf85d59deef1752724fbcf

 heat/api/aws/utils.py |    6 +++++-
 heat/common/utils.py  |    5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

commit 722bb8a259762d0da4a76e5b078f0b1b266b07e7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 15:04:44 2012 +1100

    Use jsonutils in ec2token
    
    To get access to to_primitive()
    
    Change-Id: I9a09609b5469870a217386be9fbad9261ef0c815

 heat/api/aws/ec2token.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1e07e38d0b17a962bd78d3b63f77444927d38410
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 16:11:50 2012 +1100

    Remove unused imports
    
    Change-Id: I4977a34b758f3dd2b5a4772dc074af2f0c715175

 heat/api/aws/ec2token.py                |    4 ----
 heat/api/cfn/v1/__init__.py             |   12 ++----------
 heat/api/cfn/v1/stacks.py               |    9 ++-------
 heat/api/cloudwatch/__init__.py         |    7 -------
 heat/api/cloudwatch/watch.py            |    8 --------
 heat/api/openstack/v1/__init__.py       |    8 --------
 heat/common/client.py                   |    4 ++--
 heat/common/config.py                   |    6 ++----
 heat/common/context.py                  |    1 -
 heat/common/utils.py                    |    5 -----
 heat/common/wsgi.py                     |    3 ---
 heat/db/api.py                          |    3 +--
 heat/db/sqlalchemy/migration.py         |    2 ++
 heat/db/sqlalchemy/models.py            |    1 -
 heat/engine/api.py                      |    1 -
 heat/engine/auth.py                     |   11 +----------
 heat/engine/parser.py                   |    2 --
 heat/engine/resources/cloud_watch.py    |    4 ----
 heat/engine/resources/instance.py       |    1 -
 heat/engine/resources/loadbalancer.py   |    3 ---
 heat/engine/resources/resource.py       |    2 --
 heat/engine/resources/security_group.py |    1 -
 heat/engine/resources/stack.py          |    1 -
 heat/engine/rpcapi.py                   |    2 --
 24 files changed, 12 insertions(+), 89 deletions(-)

commit e65020423b0607edf50cdddb0168f8ab7ecb468f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Nov 19 12:12:35 2012 +1100

    Fix ppetit.template parameter type Integer -> Number
    
    part of bug 1072896
    Change-Id: I47011d14330f8d8015876a88529a399a1cee98b6

 templates/ppetit.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1300ced209f7382ed476503d6d27eacf7af49625
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 16 15:50:03 2012 +0100

    RPC API: Get rid of event_create call
    
    Nothing is using this.
    
    Change-Id: Id97ce0af1e176463b92288022765f80e1b5152ed
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/rpcapi.py     |    5 -----
 heat/engine/service.py    |   27 ---------------------------
 heat/tests/test_rpcapi.py |    8 --------
 3 files changed, 40 deletions(-)

commit f844bf35119f77a56bdbc6215c961aff64440be9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Nov 14 17:51:26 2012 +0100

    ReST API: Add a convenience redirect for resources
    
    Since the path stacks/{stack_name}/{stack_id}/resources exists for each
    valid stack we can safely redirect to it from stacks/{stack_name}/resources
    without having to perform any further checks in the engine, so we may as
    well allow it.
    
    Change-Id: I0169493479f8c6840de3edad271cf98e8fd5d1da
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/api.md                         |   20 ++++++++++++++++
 heat/api/openstack/v1/__init__.py   |    4 ++++
 heat/api/openstack/v1/stacks.py     |    8 +++++--
 heat/tests/test_api_openstack_v1.py |   43 +++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 2 deletions(-)

commit d892d8166cbb002effc9518793d114406ae59112
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:37 2012 +0100

    ReST API: Add API for Resources
    
    Change-Id: I860349d03a2d7d034c600a129aead59964930b02
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/api.md                         |   42 ++++++
 heat/api/openstack/v1/__init__.py   |   23 ++++
 heat/api/openstack/v1/resources.py  |  111 ++++++++++++++++
 heat/api/openstack/v1/util.py       |   16 +++
 heat/tests/test_api_openstack_v1.py |  245 +++++++++++++++++++++++++++++++++++
 5 files changed, 437 insertions(+)

commit e743158e7a61c00e2a32c340d3f268d0835f4c69
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 16 12:10:21 2012 +0100

    RPC API: Include less detail in resource list
    
    Since the stack_list_resources command could be returning data for a large
    number of resources, avoid returning the metadata and description (which
    are not needed) to save space.
    
    Change-Id: I4e3a46315952f8dd451410622de0d68423abbbf2
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/api.py            |    7 +++++--
 heat/engine/service.py        |    2 +-
 heat/tests/test_api_cfn_v1.py |    6 ++----
 3 files changed, 8 insertions(+), 7 deletions(-)

commit 8118aebece8d141a0f675ee6302160a8a38b483a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 16 11:36:39 2012 +0100

    Refactor unit tests for ReST API
    
    This makes it easier to add tests for different controllers.
    
    Change-Id: I549295ebdd9a41ca4c184c0ff242c805399656c5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_api_openstack_v1.py |   51 ++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 21 deletions(-)

commit 0e0189e4c8ccf12ba04cbd2460422cd28c813035
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Nov 16 10:58:34 2012 +0100

    ReST API: Move remote error handler to utils module
    
    Change-Id: Id3b99c62c01f1c22aa39518bb0f650d41f5975f0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py |   30 ++++++++----------------------
 heat/api/openstack/v1/util.py   |   16 ++++++++++++++++
 2 files changed, 24 insertions(+), 22 deletions(-)

commit 4c57678486e33ee3a0f91e7f0801b5132c91141e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:37 2012 +0100

    RPC API: Return a resource identifier
    
    Change-Id: Ica33a82a8a201f625f293292e1ae7e5ca26559ef
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/api.py                |    5 +++--
 heat/tests/test_api_cfn_v1.py     |   18 ++++++++++++++++++
 heat/tests/test_engine_service.py |    3 +++
 3 files changed, 24 insertions(+), 2 deletions(-)

commit 16159b75d96197d857c46b57ebef34038e37a8e1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:36 2012 +0100

    Add identifiers for resources
    
    Change-Id: I5d0477ba8ee681f14b0f54cf8fa4d8569d541f88
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/identifier.py         |   16 ++++++++++++++++
 heat/engine/resources/resource.py |    6 ++++++
 heat/tests/test_identifier.py     |   15 +++++++++++++++
 3 files changed, 37 insertions(+)

commit 83bf4291d7ee08fd7371dc2120b5b27027807375
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:36 2012 +0100

    ReST API: Refactor routes
    
    Change-Id: I2ab3c266ea814e791bc7fd955f8502ca862a92d5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/__init__.py |   71 +++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 31 deletions(-)

commit 4ab04a5ffde7034459b0aafba0b1dc8a63a82ea3
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Nov 15 11:28:30 2012 +0000

    heat engine : remove now-unused metadata rpc calls
    
    Remove metadata_(list|get)* calls, as these are no longer used by
    heat-metadata hence are no-longer required
    
    Change-Id: Ia67b9f329f628e3172bba24ff1b1192e8ec18079
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/rpcapi.py             |   23 -----------------------
 heat/engine/service.py            |   37 -------------------------------------
 heat/tests/test_engine_service.py |   13 -------------
 heat/tests/test_rpcapi.py         |   12 ------------
 4 files changed, 85 deletions(-)

commit ad1e45573ece5bb5ca5d6b2273d0d3ab8faba806
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Nov 15 10:03:46 2012 +0000

    heat workaround for HA/Autoscaling regression
    
    Interim workaround for HA/Autoscaling regression, caused by change of
    scope for stack_get_by_name to be per-tenant, meaning we need to do a
    brute-force lookup to find the stack entry when using the stored admin
    context.
    
    A better, more comprehensive (but more intrusive) fix is in-progress
    but this at least returns us to the same functionality we had before
    
    Note this means that all stacks using WatchRule still need to have names
    unique accross all tenants.
    
    bug 1078779
    
    Change-Id: Iad1830d38262d1afb63cee16a3e366d9fd09acb4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/watchrule.py |   19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

commit 27c5ea86f3c888be909788e40688624cc9b71b10
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Nov 15 09:12:31 2012 +0000

    heat dbapi rename stack_get_by_tenant
    
    Rename stack_get_by_tenant to stack_get_all_by_tenant
    This aligns better with other dbapi calls and better describes
    the actual purpose of the call
    
    Change-Id: If410220f8423f31718e6bcbfeca62a45c94c4d18
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/db/api.py            |    4 ++--
 heat/db/sqlalchemy/api.py |    2 +-
 heat/engine/service.py    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 6ebde1b8f902be7a3ac71b5b85f5060d10f16a8c
Merge: bd8edd2 2622c2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 14 21:58:20 2012 +0000

    Merge "Allow stack.owner_id to store a uuid."

commit 2622c2ac4ecfc499f947d749b76ea1538148d4bb
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 15 09:11:47 2012 +1300

    Allow stack.owner_id to store a uuid.
    
    Fixes bug 1078854
    
    Change-Id: I3dae1502968853d563ba52bc1d6656c48d5d18ba

 .../migrate_repo/versions/013_owner_id_uuid.py     |   63 ++++++++++++++++++++
 1 file changed, 63 insertions(+)

commit bd8edd25fa8423ded878b4f3d0d0403e64c3cd17
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:36 2012 +0100

    ReST API: Split utilities into a separate module
    
    Change-Id: I140193db16b999255912f7013827b87b9ceb26e5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py |   69 +++++++--------------------------------
 heat/api/openstack/v1/util.py   |   63 +++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 57 deletions(-)

commit 40ed0ade378bb0289c546e7c2cc16891275c3e2b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 12 17:42:36 2012 +0100

    Actually validate properties of resources
    
    Properties.validate() returns an error on failure; it does not raise an
    exception (and never has). So we should look at the return value when we
    call it.
    
    Change-Id: Iaa0deb9f54055b4b1f73c0b37d26f5ac2c00d683
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/resource.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 0ffcb049c62348d33734aac88ac450996f80715d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Nov 14 15:16:54 2012 +0100

    Getting Started: Fix formatting errors
    
    Change-Id: If174fe7f54caa227996d0d779b28be8eb2050888
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit 4f30eecf3d445a044a13206f81ec451431447907
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Nov 13 09:54:40 2012 +0000

    heat templates : align autoscaling alarm descriptions with values
    
    The description doesn't match the actual values for the alarms
    
    Change-Id: I46201b75be075f4e4ac32d40031bc17b0786bb1f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 templates/AutoScalingMultiAZSample.template |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ba00a025d4a5b72638a002ce4e123f6e824d9aa9
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Nov 13 09:48:49 2012 +0000

    heat engine : create boto config via instance userdata
    
    Create boto config via instance userdata, which the instance
    cfntools can read instead of /etc/boto.cfg, avoids messy post
    install sed-mangling in the templates
    
    Change-Id: Ic94bfc2e362a3a3f93b9bdeaad6a5f988371346e
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/resources/instance.py                  |   16 ++++++++++++++++
 templates/AutoScalingMultiAZSample.template        |    5 -----
 .../WordPress_Single_Instance_With_HA.template     |    5 -----
 .../WordPress_Single_Instance_With_IHA.template    |    5 -----
 4 files changed, 16 insertions(+), 15 deletions(-)

commit a425ae02af7a25aa3654e644dc966d07f408a60c
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 12 18:31:16 2012 +0000

    heat engine : append watch server url to instance userdata
    
    Append url for watch server to instance userdata, which avoids
    post-install sed mangling in the template, and will make it easier
    to transparently switch to a different metric service
    
    Change-Id: I59b9b7efcd75d44e88ebe0a116a9ce1e3ef20c14
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 docs/GettingStarted.rst           |    1 +
 etc/heat/heat-engine.conf         |    8 ++++++++
 heat/common/config.py             |    3 +++
 heat/engine/resources/instance.py |    3 +++
 4 files changed, 15 insertions(+)

commit da712e0ccd4100fdffee6ee6543ac96c4b357d40
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Nov 13 18:19:12 2012 +0100

    Don't use OpenStack plugin in tox
    
    This plugin provides syntax colouring of the tox output, at the cost of no
    longer reporting errors in test setup (instead it just reports no tests run
    -> success).
    
    Change-Id: Idf4f71a54af6303090d464b0846e563ac3776e4a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tox.ini |    5 -----
 1 file changed, 5 deletions(-)

commit bc2c6dbcfe097b45f53b162f6433e6fdd2ca9fa7
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Nov 14 16:23:12 2012 +1300

    Always filter by tenant_id in stack_get_by_name.
    
    This means that all calls to stack_get_by_name need to provide a context.
    
    Without this change, 2 tenants cannot create stacks with the same name.
    
    Change-Id: I98c35a5d51c5c7d66e0b8a0fddc04f221d1d6ab7

 heat/db/sqlalchemy/api.py         |   16 ++++++----------
 heat/engine/service.py            |    6 +++---
 heat/engine/watchrule.py          |    2 +-
 heat/tests/test_engine_service.py |   11 +++++++++--
 4 files changed, 19 insertions(+), 16 deletions(-)

commit 18564e60e063dac98348f00aa91c7eb5de98996b
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Nov 14 11:17:52 2012 +1300

    Align pip-requires versions with nova
    
    This should also make the unit tests run again by preventing
    SqlAlchemy 8 from being used
    
    Change-Id: I6fa92540dc3369b85d135232b10701937071cbd6

 tools/pip-requires |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 9096b586e2246cbc13b13141216a775720770c80
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Nov 13 08:47:44 2012 +0000

    heat align openstack/common with latest oslo-incubator
    
    Pull in the latest oslo changes, we need the threadgroup fix
    Fixes 1078064
    
    Change-Id: I58cc94979558663d101a1a7b42446d1a9face6cf
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/openstack/common/eventlet_backdoor.py        |    6 +-
 heat/openstack/common/loopingcall.py              |    2 +-
 heat/openstack/common/notifier/rabbit_notifier.py |   31 ++------
 heat/openstack/common/rpc/__init__.py             |    2 +-
 heat/openstack/common/rpc/impl_kombu.py           |   14 ++--
 heat/openstack/common/rpc/impl_qpid.py            |   88 ++++++++-------------
 heat/openstack/common/service.py                  |    6 +-
 heat/openstack/common/setup.py                    |    8 +-
 heat/openstack/common/threadgroup.py              |    2 +-
 9 files changed, 64 insertions(+), 95 deletions(-)

commit 89caca42d693a686fc190bfd9e35606b4a21f208
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 13 14:30:15 2012 +1300

    Modify identify_stack to check for uuid.
    
    If the passed name matches a uuid then lookup by uuid instead of name.
    
    Change-Id: I2058616ce0191aab4d364b652f1b20d072f6b258

 heat/engine/identifier.py         |   10 ++++++++++
 heat/engine/service.py            |    7 +++++--
 heat/tests/test_engine_service.py |    7 +++++++
 heat/tests/test_identifier.py     |   12 ++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

commit 75fc3c9bcae6b28c5ff9aa39b2afcd4891b326c4
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Nov 12 19:59:58 2012 +0000

    heat engine : Don't wait() for killed greenthreads
    
    We don't care about the return value of any killed threads on
    delete_stack, and the greenthreads will all raise a GreenletExit
    exception after being kill()'d anyway.
    Also see related openstack-common fix : https://review.openstack.org/15906
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/service.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 8f2993610d0f12f7e711107eaf56db3d28b112b0
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 12 08:38:38 2012 +1300

    Pass a Stack entity to Stack.load().
    
    Every call to Stack.load (except one) is loading models.Stack then passing just
    the ID to Stack.load, which then loads models.Stack again.
    
    As far as I can tell, SQLAlchemy doesn't have a 2nd level cache, so this results
    in the db being queried twice.
    
    This change makes it possibe to pass a stack *or* an ID to Stack.load, and
    converts all calls to pass in a stack if it is available.
    
    Change-Id: I501ebd403a241cc3b4a5c1e3070137cfc360bbda

 heat/engine/api.py                  |    2 +-
 heat/engine/parser.py               |   15 ++++++++-------
 heat/engine/service.py              |   20 ++++++++++----------
 heat/engine/watchrule.py            |    2 +-
 heat/tests/test_api_cfn_v1.py       |   12 ++++++------
 heat/tests/test_api_openstack_v1.py |   12 ++++++------
 heat/tests/test_engine_service.py   |   18 +++++++++++-------
 7 files changed, 43 insertions(+), 38 deletions(-)

commit ec8d548b88d94695c847ec5887f916a7f80dcca5
Merge: e848c08 afd1b9a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 9 11:16:05 2012 +0000

    Merge "Switch to UUID for the Stack primary key."

commit afd1b9abdbf9b7b037ef144b5915818b4624bc83
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 9 15:45:06 2012 +1300

    Switch to UUID for the Stack primary key.
    
    For the migrate upgrade, existing integer keys remain and any subsequent stack
    will be assigned a uuid.
    
    For a migrate downgrade, it should work fine if there have been no stacks added
    since ugrade. Added stacks will have their IDs 'truncated' back to an integer
    which will require some manual fixup after downgrade.
    
    Change-Id: Ib882bece911fcbc96fffab16a9f0e5ce3cb55fed

 .../migrate_repo/versions/012_stack_id_uuid.py     |   94 ++++++++++++++++++++
 heat/db/sqlalchemy/models.py                       |    8 +-
 2 files changed, 99 insertions(+), 3 deletions(-)

commit e848c080790996e85fbbe0080e50b51d9deab46c
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 9 08:43:23 2012 +1300

    Add a list_stacks RPC call.
    
    This differs from the old show_stack(None) by not resolving stack data.
    
    heat list does not display any of the resolved stack data. Resolving outputs
    can be especially slow since FnGetAtt may block while it calls out
    to another service (such as with the quantum resources).
    
    Without this change, running heat list on a single Quantum.template takes 1.8s
    vs 0.7s.
    
    In the future, list_stacks can be made to support paging of results.
    
    Change-Id: Iae30338b66912d660f1cf48119893b1ab593b67a

 heat/api/cfn/v1/stacks.py       |    4 +---
 heat/api/openstack/v1/stacks.py |    4 +---
 heat/engine/parser.py           |   12 ++++++++----
 heat/engine/rpcapi.py           |   10 +++++++++-
 heat/engine/service.py          |   23 ++++++++++++++++++-----
 5 files changed, 37 insertions(+), 16 deletions(-)

commit a09a9a2c21e0278ab8e59f28f2a1d653d4317f3a
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 8 16:39:18 2012 +1300

    Rename instance_id to resource_id.
    
    The current naming gets increasingly inaccurate with every new resource ;)
    
    Change-Id: I98629c7f8fd9c391f58c16ae1f6f2a7a232a2802

 heat/engine/api.py                                 |    2 +-
 heat/engine/resources/autoscaling.py               |   14 +++++------
 heat/engine/resources/eip.py                       |   14 +++++------
 heat/engine/resources/instance.py                  |   14 +++++------
 heat/engine/resources/quantum/floatingip.py        |   10 ++++----
 heat/engine/resources/quantum/net.py               |    6 ++---
 heat/engine/resources/quantum/port.py              |    6 ++---
 heat/engine/resources/quantum/quantum.py           |    2 +-
 heat/engine/resources/quantum/router.py            |   14 +++++------
 heat/engine/resources/quantum/subnet.py            |    6 ++---
 heat/engine/resources/resource.py                  |   22 ++++++++---------
 heat/engine/resources/s3.py                        |   12 ++++-----
 heat/engine/resources/security_group.py            |    8 +++---
 heat/engine/resources/stack.py                     |    6 ++---
 heat/engine/resources/user.py                      |   18 +++++++-------
 heat/engine/resources/volume.py                    |   10 ++++----
 heat/engine/resources/wait_condition.py            |    2 +-
 .../test_WordPress_Single_Instance_With_EBS_EIP.py |    2 +-
 .../test_WordPress_Single_Instance_With_EIP.py     |    2 +-
 heat/tests/test_autoscaling.py                     |   26 ++++++++++----------
 heat/tests/test_engine_service.py                  |    4 +--
 heat/tests/test_instance.py                        |    4 +--
 heat/tests/test_user.py                            |    8 +++---
 23 files changed, 106 insertions(+), 106 deletions(-)

commit fb5fe068660319d079da6c44aab7d7e639c8a015
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 8 15:49:19 2012 +1300

    Move client connection out of resources.py.
    
    Client connection references are currently cached at the resource instance
    level, which doesn't seem very useful.
    
    This change moves the client connection and caching to clients.py, then puts a
    Clients instance in a Stack. This means that (for example) all requests to nova
    in one stack will come from the same client instance.
    
    Change-Id: I22519f8ae4278ad128d3785d090294285f3a1b89

 heat/engine/clients.py            |  191 +++++++++++++++++++++++++++++++++++++
 heat/engine/parser.py             |    2 +
 heat/engine/resources/resource.py |  155 +-----------------------------
 3 files changed, 197 insertions(+), 151 deletions(-)

commit 6048c0dd6b056b396597c027a463ba2ef42133ee
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Nov 8 15:41:25 2012 +1300

    Fix FnGetAtt id test

 heat/tests/test_quantum.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 9e31cb53779984f9f201d6fdf3640d59da0a2562
Merge: 7381f16 e5ec6b4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 7 21:18:54 2012 +0000

    Merge "Fix cloud-init runcmd to be exec friendly"

commit e5ec6b4b5dccdbf9de4fe274a3e2d48658140900
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Nov 7 15:53:45 2012 -0500

    Fix cloud-init runcmd to be exec friendly
    
    Can't use colon builtin apparently, or you'll get this:
    /var/lib/cloud/instance/scripts/runcmd: line 2:
     {setenforce 0 > /dev/null 2>&1 ||:: No such file or directory
    
    Added cloud-init debug output to get the above, copied from:
    http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/view/head:/doc/examples/cloud-config-chef.txt
    
    Change-Id: I341cf73bc9a0f843d7ab8c99a9d15e1d514654e7
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/cloudinit/config |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 7381f16c2ba558dcf8295fb4152f262d548babe4
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Nov 7 12:59:56 2012 +1300

    Replace KeyStoneCreds params with X-Auth headers.
    
    Username/password are now in X-Auth-User, X-Auth-Key

 heat/api/aws/ec2token.py |    6 +++---
 heat/client.py           |    5 +++--
 heat/cloudformation.py   |    2 +-
 heat/common/context.py   |   10 ++++------
 4 files changed, 11 insertions(+), 12 deletions(-)

commit 8c1931b68225bb99008a1b4b1e7edf3c8929efb0
Merge: e4e4089 6d43f58
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 22:57:06 2012 +0000

    Merge "A template which associates an instance with a Quantum port."

commit e4e408986d6883bc686fcd5eaf099d994c1e001e
Merge: 1d66f9b 8014cf3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 22:55:42 2012 +0000

    Merge "Type is now mandatory. Boolean now exists."

commit 1d66f9b94375c3f0725b5b0d9c0209820934eed9
Merge: 66dbd41 39a9721
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 22:54:01 2012 +0000

    Merge "Make Boolean property a bool type. Since json has a native bool type, allow bool or string as the property value. Validating a Boolean type value will now convert a string to a bool."

commit 66dbd413acf437ca57e41a7fdfe34476f58e7b7b
Merge: 0f29c45 02d3313
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 22:52:52 2012 +0000

    Merge "Quantum template to demonstrate floatingip."

commit 0f29c45e4ff8ae123b3ce06163801446c69d6153
Merge: f8f6bf2 eff1af8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 15:44:34 2012 +0000

    Merge "Cleanup runcmd to exit 0 and not use 'type'"

commit 02d3313401af8b0b47590cba41b3b5fa94b54c6e
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 6 15:40:38 2012 +1300

    Quantum template to demonstrate floatingip.

 templates/Quantum_floating.template |   52 +++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

commit 39a9721232649664cf0c96d2c58ad718efe88ce1
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 6 15:38:53 2012 +1300

    Make Boolean property a bool type.
    Since json has a native bool type, allow bool or string as the property value.
    Validating a Boolean type value will now convert a string to a bool.
    
    Change-Id: Ia1843e0f56e5afb2914708e42b62f2063279317f

 heat/engine/resources/properties.py |    4 +++-
 heat/tests/test_properties.py       |   14 +++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

commit 6d43f58669b8b9b873e3b44a982ddaeba3d3cf18
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 6 12:51:01 2012 +1300

    A template which associates an instance with a Quantum port.

 ...WordPress_Single_Instance_With_Quantum.template |  189 ++++++++++++++++++++
 1 file changed, 189 insertions(+)

commit 8014cf3bb73e7c531f204002f13d8ecee3242716
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Nov 6 12:49:48 2012 +1300

    Type is now mandatory. Boolean now exists.
    
    This is required for Quantum resource types to work with new Properties.

 heat/engine/resources/quantum/net.py    |    3 ++-
 heat/engine/resources/quantum/port.py   |    3 ++-
 heat/engine/resources/quantum/router.py |    2 +-
 heat/engine/resources/quantum/subnet.py |    3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

commit f8f6bf2a57dcf144a3360b9085d970b62372c06a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 30 21:50:00 2012 +0100

    Handle list properties that do not contain objects
    
    The previous implementation of schema verfication on properties required
    that the schema for the contents of a property list always be a map. Now
    this is specified explicitly, so that in theory a property could also be a
    list of Strings or Integers.
    
    Change-Id: Icdd9a6c9f9b1e884f959c74f0803b7f3bd2aecc4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/autoscaling.py    |    7 ++++---
 heat/engine/resources/instance.py       |    8 ++++++--
 heat/engine/resources/loadbalancer.py   |    3 ++-
 heat/engine/resources/properties.py     |    2 +-
 heat/engine/resources/quantum/port.py   |    3 ++-
 heat/engine/resources/quantum/subnet.py |    5 ++++-
 heat/tests/test_properties.py           |   16 ++++++++++++++--
 7 files changed, 33 insertions(+), 11 deletions(-)

commit 8e16b5168cba7765ccd3bbbdbcdff922e3769c13
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 14:42:42 2012 +0100

    Remove the CheckedDict class
    
    Its functionality has been completely superceded by the new Properties
    and Parameters implementations.
    
    Change-Id: I33a1990ee543a189dd3ec8f22eec27e2b0514d09
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/checkeddict.py          |  159 -----------------------------------
 heat/tests/unit/test_checkeddict.py |  134 -----------------------------
 2 files changed, 293 deletions(-)

commit 275eb17e973b2f684ad01583f3e9a252b2e9c1cb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 17:55:05 2012 +0100

    Use new Parameters class in unit test
    
    This test was still using the old CheckedDict implementation for
    parameters.
    
    Change-Id: I2ade5a81867d6b9f7517061e520da99575e8fbbd
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_parser.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 33b09448c14468b768d2d4da4f756e8132065d81
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 17:30:57 2012 +0100

    Get rid of Resource.calculate_properties()
    
    Use the new Properties class to lazily load property values so that we
    always get the latest data, and get rid of the stateful hacks.
    
    Change-Id: I02a1b927606da217d4adab1ca04b659abadda2ce
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/checkeddict.py              |   37 +++++++------------------------
 heat/engine/parser.py                   |    9 --------
 heat/engine/resources/autoscaling.py    |    3 ---
 heat/engine/resources/instance.py       |    1 -
 heat/engine/resources/resource.py       |   20 +++++------------
 heat/engine/resources/user.py           |    1 -
 heat/engine/resources/wait_condition.py |    1 -
 heat/tests/test_engine_service.py       |    1 -
 heat/tests/test_loadbalancer.py         |    2 +-
 heat/tests/test_quantum.py              |   14 ++++++------
 heat/tests/unit/test_checkeddict.py     |    4 +++-
 11 files changed, 24 insertions(+), 69 deletions(-)

commit 6a19ccb7b82bcf6f371c3fbbd49177986b91f0fd
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 14:28:14 2012 +0100

    Add a Properties implementation with lazy loading
    
    This will allow property values to be calculated on demand, rather than
    stored as state.
    
    Change-Id: I93fefa911b96c931cbf48b82b5a7ccc13ad99168
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/properties.py |  193 ++++++++++++++++++++
 heat/tests/test_properties.py       |  331 +++++++++++++++++++++++++++++++++++
 2 files changed, 524 insertions(+)

commit c44c27404f8e47dd400357f1866a18fff57515f3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 14:37:36 2012 +0100

    Avoid modifying the Properties of a Load Balancer
    
    Properties are defined by the template, and should not be modified. In this
    case it was just as a convenience, since the value does not actually need
    to be persisted beyond even the current call.
    
    Change-Id: I6ca07989d246ec618b2ca5f051f8e614e24c81ae
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/loadbalancer.py |   10 ++++------
 heat/tests/test_loadbalancer.py       |    3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

commit 9c13216d2b4e777d6dc2399bb1b3a8784da7d3ec
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Nov 5 12:06:11 2012 +0100

    Fix schemata errors for properties
    
    In particular, Integer refers to a literal integer in the JSON markup:
    
      {"IntegerProperty": 42}
    
    So use Number to refer to a string-encoded number:
    
      {"NumberProperty": "42"}
    
    Change-Id: Id285ae6145ba888f59529207343d016fba3825eb
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources/autoscaling.py  |    6 +++---
 heat/engine/resources/loadbalancer.py |   14 +++++++-------
 heat/engine/resources/user.py         |    7 +++++--
 3 files changed, 15 insertions(+), 12 deletions(-)

commit 2162b8047be83875e3f226140dfade88517371a1
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Oct 30 08:41:13 2012 +1300

    Add a set of native quantum resource types.
    
    The properties schemas map directly to the Quantum REST API, which makes
    the implementation (and documentation) simpler.
    
    The base class QuantumResource contains some default methods and
    common utility functions.
    
    templates/Quantum.template can be run without any parameters and only creates
    network resources, no instances.
    
    More example templates and tests will come later.
    
    Change-Id: Ia270294440eeec5163e35009f6be0b5db9ad78c1

 heat/engine/resources/quantum/floatingip.py |   77 ++++++++++++
 heat/engine/resources/quantum/net.py        |   47 +++++++
 heat/engine/resources/quantum/port.py       |   59 +++++++++
 heat/engine/resources/quantum/quantum.py    |   92 ++++++++++++++
 heat/engine/resources/quantum/router.py     |  102 +++++++++++++++
 heat/engine/resources/quantum/subnet.py     |   65 ++++++++++
 heat/engine/resources/register.py           |   13 ++
 heat/engine/resources/resource.py           |   40 ++++++
 heat/tests/test_quantum.py                  |  182 +++++++++++++++++++++++++++
 templates/Quantum.template                  |  100 +++++++++++++++
 tools/pip-requires                          |    2 +-
 11 files changed, 778 insertions(+), 1 deletion(-)

commit b3a57062ade24b9fbfc1f02f130ad353fffc49d4
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Nov 2 17:07:47 2012 +1300

    Recursively replace all : with . in Output keys.
    
    This is needed so that some Quantum properties with colons in the keys are not
    interpreted as xml namespaces.
    
    Change-Id: Iba5290a408595b2f028744c10315daac29da055e

 heat/api/cfn/v1/stacks.py |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

commit 499e492d946a5c456cdb7087f62497464649bf34
Merge: 5f60499 f77c09c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Nov 4 23:51:39 2012 +0000

    Merge "Rename heat client to heat-cfn."

commit f77c09c2a5749a199028316ceb821ab9907b3e51
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 5 09:29:35 2012 +1300

    Rename heat client to heat-cfn.
    
    This is to allow python-heatclient to eventually become the default heat
    client.
    
    Documentation in heat.wiki will be updated to refer to heat-cfn when this
    change is pushed.
    
    Change-Id: I2209c36adf41fa5d0df0caf9200f7fedbdd51805

 bin/heat                       |  663 ----------------------------------------
 bin/heat-boto                  |    2 +-
 bin/heat-cfn                   |  663 ++++++++++++++++++++++++++++++++++++++++
 docs/GettingStarted.rst        |   14 +-
 docs/man/man1/heat-cfn.1       |  243 +++++++++++++++
 docs/man/man1/heat.1           |  243 ---------------
 etc/bash_completion.d/heat     |   22 --
 etc/bash_completion.d/heat-cfn |   22 ++
 run_tests.sh                   |    2 +-
 setup.py                       |    2 +-
 tools/uninstall-heat           |    2 +-
 11 files changed, 939 insertions(+), 939 deletions(-)

commit 5f60499602139d2bca727033e7390f784c14af88
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Nov 5 11:05:04 2012 +1300

    Update openstack-common, add network_utils.
    
    This is required by impl_kombu.py. The engine failed to start without it.

 heat/openstack/common/exception.py      |   12 -----
 heat/openstack/common/network_utils.py  |   68 +++++++++++++++++++++++++++
 heat/openstack/common/rpc/impl_kombu.py |    2 +-
 heat/openstack/common/rpc/impl_zmq.py   |    2 +-
 heat/openstack/common/utils.py          |   76 -------------------------------
 openstack-common.conf                   |    2 +-
 6 files changed, 71 insertions(+), 91 deletions(-)

commit 8135da2fb42a8f34d530369dde6f3ddd216ffd97
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Nov 2 22:02:00 2012 +1100

    Use openstack-common service.py
    
    Change-Id: Idbc145209c039e9362cf97c9926e050f809ef0fa

 bin/heat-engine                                    |   20 +-
 heat/engine/manager.py                             |  522 --------------
 heat/engine/service.py                             |  483 +++++++++++++
 heat/manager.py                                    |  182 -----
 heat/service.py                                    |  241 -------
 .../tests/functional/test_WordPress_2_Instances.py |    3 -
 .../test_WordPress_2_Instances_With_EBS.py         |    3 -
 .../test_WordPress_Single_Instance_With_EBS.py     |    3 -
 .../test_WordPress_Single_Instance_With_EBS_EIP.py |    3 -
 .../test_WordPress_Single_Instance_With_EIP.py     |    3 -
 heat/tests/test_engine_manager.py                  |  718 --------------------
 heat/tests/test_engine_service.py                  |  718 ++++++++++++++++++++
 heat/tests/test_validate.py                        |   26 +-
 13 files changed, 1219 insertions(+), 1706 deletions(-)

commit 9874dec669a937e8b844e9e304e65f311ca4cc82
Merge: 183bad2 589b4a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 2 09:47:52 2012 +0000

    Merge "Add service.py from openstack-common"

commit 183bad2534d8352ddadb6a77ba8ca509347505d7
Merge: 77069ee c6a624f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 2 09:47:33 2012 +0000

    Merge "Update openstack-common"

commit 77069eefd54b291b28edce2fcd275bb2bcf619d2
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Nov 2 08:57:52 2012 +0000

    heat templates : Align AutoScaling template with cfntools
    
    Updated cfntools require authentication for cfn-push-stats,
    so the AutoScaling template needs the user/key and boto.cfg
    additions, same as in the HA templates, otherwise cfn-push-stats,
    and hence autoscaling doesn't work
    
    Change-Id: Ib3ef4a932bb656f29e25ef745409f5fe3e82c356
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 templates/AutoScalingMultiAZSample.template |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

commit 589b4a76161ada22faefd39195340f5177b2e934
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Nov 1 14:17:15 2012 +1100

    Add service.py from openstack-common
    
    Change-Id: Ia4996d89d0fdba6dbeb44ae4cf3ca202c78886ee

 heat/openstack/common/eventlet_backdoor.py |   78 +++++++
 heat/openstack/common/loopingcall.py       |   88 ++++++++
 heat/openstack/common/service.py           |  328 ++++++++++++++++++++++++++++
 heat/openstack/common/threadgroup.py       |  119 ++++++++++
 openstack-common.conf                      |    2 +-
 5 files changed, 614 insertions(+), 1 deletion(-)

commit c6a624f3ab73a5b1770e69d35713c92a82ecb54c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Nov 1 14:00:41 2012 +1100

    Update openstack-common
    
    Change-Id: I3abd011729f413dbd20806f54c9ae6963641d59a

 heat/openstack/common/cfg.py            |    6 +-
 heat/openstack/common/gettextutils.py   |    2 +-
 heat/openstack/common/log.py            |   18 +++++
 heat/openstack/common/notifier/api.py   |    6 +-
 heat/openstack/common/rpc/impl_kombu.py |  133 ++++++++++++++++++++-----------
 heat/openstack/common/rpc/impl_qpid.py  |   22 +++--
 heat/openstack/common/rpc/service.py    |   70 ++++++++++++++++
 heat/openstack/common/setup.py          |   32 ++++----
 heat/openstack/common/timeutils.py      |   21 +++--
 heat/openstack/common/utils.py          |   46 +----------
 10 files changed, 231 insertions(+), 125 deletions(-)

commit f4c34c56285ba17005fb413d8f32f11d4d44332b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 31 20:18:43 2012 +0100

    Implement NoEcho for parameters
    
    Change-Id: I60ce651367479205e0d456e2ac0ec3f949766383
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/api.py            |    2 +-
 heat/engine/manager.py        |    2 +-
 heat/engine/parameters.py     |   13 ++++++++++++-
 heat/tests/test_parameters.py |   24 ++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

commit d918f3919f46ab1663d065e81c12819a8624c7a8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 31 20:18:43 2012 +0100

    Use new Parameters class for validation
    
    The Stack.validate() method is no longer used for the validate_template
    feature (since it requires the parameter values in order to parse the whole
    template), so move the code for outputting parameter metadata to where it
    is actually used.
    
    Change-Id: Ibf2ad7cb485bff75953c952f34ea4a597ea5e2f8
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py            |   27 +++++++++++++++------------
 heat/engine/parser.py             |   18 +-----------------
 heat/tests/test_engine_manager.py |   12 ++++++------
 3 files changed, 22 insertions(+), 35 deletions(-)

commit f605bcc812e2f0eaeca7c62da759f16a7478a6b0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 31 20:18:43 2012 +0100

    Separate Parameters implementation from Properties
    
    There are only 3 types allowed for Parameters (String, Number and
    CommaDelimitedList), but we are currently allowing more due to a shared
    implementation with Properties (which is an internal implementation
    detail). This creates a separate implementation for Parameters with only
    the allowed types.
    
    Change-Id: If51ec538893a582da2caa0356c25e515e9d8004e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parameters.py     |  262 +++++++++++++++++++++++++++++++++++
 heat/engine/parser.py         |   59 ++------
 heat/tests/test_parameters.py |  307 +++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_parser.py     |   44 ------
 4 files changed, 577 insertions(+), 95 deletions(-)

commit a5485ad10d3a0336b1f92c1938d3b87ce15bdf82
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 31 20:18:42 2012 +0100

    Clean up hacks for parameter passing in unit tests
    
    Don't rely on the internal behaviour of the Parameters class.
    
    Change-Id: I14f11e6ead1c49cf540bba453200fdec7f2ce7a3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_autoscaling.py  |    7 ++++---
 heat/tests/test_dbinstance.py   |    7 ++++---
 heat/tests/test_eip.py          |    7 ++++---
 heat/tests/test_instance.py     |   14 ++++++++------
 heat/tests/test_loadbalancer.py |    9 ++++-----
 heat/tests/test_user.py         |   15 +++++++++------
 heat/tests/test_validate.py     |    8 --------
 heat/tests/test_volume.py       |    7 ++++---
 8 files changed, 37 insertions(+), 37 deletions(-)

commit d806f727dbebe6bc1616ed4723f967c94f1349a8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 31 20:18:42 2012 +0100

    Put the Template class in its own file
    
    Change-Id: I5e3a9ef79c1c4f893720cfa529066d49a7c83ad1
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/api.py        |    5 +-
 heat/engine/parser.py     |  194 +++----------------------------------------
 heat/engine/template.py   |  200 +++++++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_parser.py |   15 ++--
 4 files changed, 224 insertions(+), 190 deletions(-)

commit e0bb98d4f5ec918cec8514b8bc5c39057aaaf6d2
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 31 16:28:19 2012 +0000

    heat-keystone-setup : fix error on folsom first-install
    
    When running heat-keystone-setup for the first time after (re)installing
    openstack folsom, it fails, because the user-role-list is running *as* the
    heat user, not reading the roles assigned to the heat user, which fails
    because on a new install the heat user does not have the admin role.
    Using the credentials from the environment means we run the command as
    admin, but --user_id selects the roles for the heat user.
    
    Change-Id: Ib2733e63f664d75be1e2e3bd43038bbd1dbebde8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat-keystone-setup |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0ba94dcc7a2d6fac0579331beb0e6ca267ee8c81
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 14:50:28 2012 +0100

    heat engine : add heat_waitcondition_server_url
    
    Add config option for waitcondition server, since metadata
    and waitcondition notifications are no longer handled by the
    same API
    
    Change-Id: Idc1b39c6c60b8473316fe4861f0f060568540b09
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 docs/GettingStarted.rst                 |    1 +
 etc/heat/heat-engine.conf               |    8 ++++++++
 heat/common/config.py                   |    3 +++
 heat/engine/resources/wait_condition.py |    2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

commit c8ec051a67fcdeecccefa5b911e42cef5fba5713
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 14:40:47 2012 +0100

    heat metadata : Remove all non-waitcondition related logic
    
    Remove all logic except that required by cfn-signal, since both
    cfn-hup and cfn-push-stats have been ported to use the CFN and
    Cloudwatch APIs respectively
    
    Change-Id: I087349ff3ab901c880a248bd124396a1383c0a5e
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/metadata/api/v1/__init__.py |   15 ---------------
 heat/metadata/api/v1/metadata.py |   36 ------------------------------------
 2 files changed, 51 deletions(-)

commit 997a2165e7d64d295de0b92d8261cde3fa5ac53f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 14:30:31 2012 +0100

    heat metadata : remove metadata_url logic
    
    Remove logic where the heat-metadata server registers a
    URL on startup with the engine.  The instance metadata is
    now served via the CFN api, so we just have a config-file
    option specifying the URL of the CFN API.  We don't want to
    preserve the "register on startup" logic, because we need the
    engine to have access to this information even if it is
    restarted independent of some other service (avoid reliance on
    services coming up in a particular order)
    
    Change-Id: I690170977227ec96451d2a2fd25f7e507370b604
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat-metadata                       |   21 ---------------------
 docs/GettingStarted.rst                 |   18 +++++++++++++++++-
 etc/heat/heat-engine.conf               |    9 ++++++++-
 heat/engine/manager.py                  |    3 ---
 heat/engine/resources/instance.py       |    8 ++++----
 heat/engine/resources/resource.py       |   11 -----------
 heat/engine/resources/wait_condition.py |    4 +++-
 7 files changed, 32 insertions(+), 42 deletions(-)

commit 763cf3142b2d68285a7f1a59e12fd5f1031c3ac0
Merge: ffd410d c629b24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 26 07:28:13 2012 +0000

    Merge "Format stack_identity as id *and* links."

commit c629b241c1380424805cd909b1e839cc50502c6f
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Oct 25 13:31:52 2012 +1300

    Format stack_identity as id *and* links.
    
    Here the id is defined as {stack_id}
    
    Change-Id: Ieadda61d608e2d3e7125b42758cf80588178c042

 heat/api/openstack/v1/stacks.py     |   26 ++++++++++++++++++--------
 heat/tests/test_api_openstack_v1.py |    8 ++++++--
 2 files changed, 24 insertions(+), 10 deletions(-)

commit ffd410dab5bd5d8a05c8eb1772765af45a602792
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Oct 25 20:44:20 2012 +0200

    Move resources into a separate sub-package
    
    Change-Id: I5a6d74949b6f39a9df6c5077c2ff768f50fb3ac1
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/autoscaling.py              |  200 ------------
 heat/engine/cloud_watch.py              |   82 -----
 heat/engine/dbinstance.py               |  240 --------------
 heat/engine/eip.py                      |  113 -------
 heat/engine/instance.py                 |  300 ------------------
 heat/engine/loadbalancer.py             |  353 ---------------------
 heat/engine/manager.py                  |    1 -
 heat/engine/resource_types.py           |   63 ----
 heat/engine/resources.py                |  527 -------------------------------
 heat/engine/resources/__init__.py       |   16 +
 heat/engine/resources/autoscaling.py    |  200 ++++++++++++
 heat/engine/resources/cloud_watch.py    |   76 +++++
 heat/engine/resources/dbinstance.py     |  240 ++++++++++++++
 heat/engine/resources/eip.py            |  101 ++++++
 heat/engine/resources/instance.py       |  300 ++++++++++++++++++
 heat/engine/resources/loadbalancer.py   |  353 +++++++++++++++++++++
 heat/engine/resources/register.py       |   59 ++++
 heat/engine/resources/resource.py       |  527 +++++++++++++++++++++++++++++++
 heat/engine/resources/s3.py             |  126 ++++++++
 heat/engine/resources/security_group.py |   90 ++++++
 heat/engine/resources/stack.py          |  109 +++++++
 heat/engine/resources/user.py           |  212 +++++++++++++
 heat/engine/resources/volume.py         |  123 ++++++++
 heat/engine/resources/wait_condition.py |  153 +++++++++
 heat/engine/s3.py                       |  126 --------
 heat/engine/security_group.py           |   90 ------
 heat/engine/stack.py                    |  109 -------
 heat/engine/user.py                     |  212 -------------
 heat/engine/volume.py                   |  123 --------
 heat/engine/wait_condition.py           |  153 ---------
 heat/tests/test_autoscaling.py          |    4 +-
 heat/tests/test_dbinstance.py           |    4 +-
 heat/tests/test_eip.py                  |    2 +-
 heat/tests/test_engine_manager.py       |    2 +-
 heat/tests/test_instance.py             |    2 +-
 heat/tests/test_loadbalancer.py         |   14 +-
 heat/tests/test_resource.py             |   20 +-
 heat/tests/test_s3.py                   |    2 +-
 heat/tests/test_user.py                 |    2 +-
 heat/tests/test_validate.py             |    4 +-
 heat/tests/test_volume.py               |    2 +-
 heat/tests/test_waitcondition.py        |    2 +-
 42 files changed, 2715 insertions(+), 2722 deletions(-)

commit c31d2426a4f2b3ca3bbe96a9d6c280f521f0fc46
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Oct 25 22:18:27 2012 +0200

    Move Timestamp code to separate file
    
    Change-Id: I57627f5b9048bbbcda0a07ac274fd1e579348496
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parser.py    |    5 +++--
 heat/engine/resources.py |   39 +++-----------------------------------
 heat/engine/timestamp.py |   47 ++++++++++++++++++++++++++++++++++++++++++++++
 heat/engine/watchrule.py |    6 +++---
 4 files changed, 56 insertions(+), 41 deletions(-)

commit 70b609567d72fa22d645df0665308af98418e4fd
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 14:04:49 2012 +0100

    heat-keystone-setup : change role to heat_stack_user
    
    Change heat_instance role name to heat_stack_user after discussions
    
    Change-Id: I14e95df0e02d82566f4758510ae38f6b26ccb532
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat-keystone-setup |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit cd9a3a7c95f560551214c10784590111537ff3f1
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 11:33:20 2012 +0100

    heat engine : add template-defined users to keystone role
    
    Add all keystone users created by the User resource type
    to a special keystone role, which can be used later for
    defining RBAC policy for these users, and also works around
    a keystone bug (1060959) on Folsom
    
    Fixes #279
    
    Change-Id: I94931e427ed51f4332bcb506220925b7ce8097bc
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 etc/heat/heat-engine.conf |    3 +++
 heat/common/config.py     |    3 +++
 heat/engine/user.py       |   17 +++++++++++++++++
 heat/tests/test_user.py   |   16 ++++++++++++++++
 4 files changed, 39 insertions(+)

commit 92c985191b907096b1cb2aa8c77efa9773596a35
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 23 21:59:38 2012 +0100

    heat engine : Allow instance users to view their own details
    
    So that cfn-hup can read instance metadata via the DescribeStackResource
    API call, we need non-admin "instance users" to be allowed to read their
    own AccessKey resource details (since it can-be/is referenced in the
    instance resource metadata).  The change in this patch should allow non-admin
    users to read *only their own* secret AccessKey, and leave existing admin-user
    visibility of the AccessKey resources unchanged.
    
    Change-Id: Ic26d614d8e30104fbb354a67d3376b5d995ae8cc
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/user.py     |   32 +++++++++++++++++++-------------
 heat/tests/test_user.py |    2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

commit 4743749b80593878ac85bc1aa2d844b606cda6b0
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 25 10:16:29 2012 +0100

    heat-keystone-setup add instance role
    
    Add "heat_instance" role which we will assign all "instance users"
    to in the engine when we create them
    
    Ref #279
    
    Change-Id: If7cc07c605f7696c1e9f617dbfca1b81d5b04196
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat-keystone-setup |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit f5099e02d5b2f1312f10dd255c11d951c75ce34e
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 24 13:48:22 2012 +0100

    heat-keystone-setup workaround keystone arg syntax
    
    Keystone user-role-add syntax is not the same on essex
    and folsom, so try both formats so we can work with either
    Removes potentially unreliable approach to detecting keystone
    version, and also avoids error on folsom when the user already
    has the specified role
    
    Fixes #272
    
    Change-Id: Iece52223a29069a1fd517018cc49613be6fac318
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat-keystone-setup |   47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

commit b3b56ff59d1402ba2188778e683d5b3725fb941e
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 24 13:41:34 2012 +0100

    heat-keystone-setup workaround keystone output reordering
    
    Folsom version of keystoneclient orders the columns for
    keystone user-list differently, so we need to detect the
    new format to extract the correct field
    
    Fixes #273
    
    Change-Id: I46f653dd3a8f7b5a68648fbd72671f95b386a547
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat-keystone-setup |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 29b7ae7c1be059ef5b8b457329c453189417a175
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 23 14:20:37 2012 +0100

    heat tests : StackBoto fix _check_*_result functions
    
    The _check_*_result functions don't actually check anything
    so make them check the response format, which should be a stackid
    
    Change-Id: I6b22cdc64409846caadbd2ebca5e8a81eccc81a6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit fd66a93cc77e7c719b710496c8eeba23f7f60482
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 23 14:16:39 2012 +0100

    heat tests : refactor stackid check into utils.Stack
    
    Rework utils.Stack._check_stackid so it can be used in the
    tests to verify stackid format, avoiding maintaining multiple
    copies of a stackid regex
    
    Change-Id: If7fbd7b35626c377b42a43ffa03ee8067540963b
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_Actions.py      |   13 +++++------
 heat/tests/functional/test_CFN_API_Actions_Boto.py |   12 +++++-----
 heat/tests/functional/util.py                      |   23 ++++++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

commit dd6a3781520004cec56cb8f87aafd762e9322430
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 23 13:42:15 2012 +0100

    heat tests : fix CFN_API_Actions test fix state reason
    
    state reason is "state changed" not None now we commit
    the IN_PROGRESS state transition to the DB
    
    Change-Id: I4c6641cd489de13ee9575fcdf879cae95ad7df4d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_Actions.py      |    6 +++---
 heat/tests/functional/test_CFN_API_Actions_Boto.py |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 445a1fdf783b2521c528265a9c10a5c8b516befa
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 23 13:07:57 2012 +0100

    heat tests : fix CFN_API_Actions test stackid regex
    
    stackid format has changed since move from tenant name to
    tenant id
    
    Change-Id: I5e8304f33d49133bc1b7e5530ae1a8323e2986c5
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_Actions.py      |    5 +++--
 heat/tests/functional/test_CFN_API_Actions_Boto.py |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

commit b0661fdc8cb289a4d0d531809fcfc399936d3f18
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Oct 18 17:13:02 2012 +0100

    heat engine : kill running greenthreads on stack_delete
    
    Add logic to track running eventlet greenthreads and kill
    them when we start a stack_delete.  This should avoid errors
    where long-running greenthreads end up referencing stacks which
    have subsequently been deleted.
    
    Fixes #261
    Ref #223
    
    Change-Id: I0d10b6f2dad0efa1caec18a67a3cc66cc693ea24
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/manager.py            |   52 ++++++++++++++++++++++++++++++++++---
 heat/tests/test_engine_manager.py |   18 ++++++++-----
 2 files changed, 61 insertions(+), 9 deletions(-)

commit 320999bf804869e6579c2d555bf211e17c86858d
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 17 14:38:08 2012 +0100

    heat engine : Store all resource states to DB
    
    Resources should be committed to the DB on transisiton
    to CREATE_IN_PROGRESS state, otherwise resources
    which take a long time to go from CREATE_IN_PROGRESS to
    CREATE_COMPLETE (e.g WaitConditions) are invisible while
    in the CREATE_IN_PROGRESS state to all except the thread
    creating them.
    
    Change-Id: If1563505e854c216c0f6a5ce84b613e1ccb74386
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/resources.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit aa9f26b00041761e35fd205faf482d58819bbc1a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 23 11:49:47 2012 +0200

    Bump version to v8
    
    v7 has branched
    
    Change-Id: Ib8d3471576e0d408b18f4ab4d04ffdeafba234b5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d65ae5b3133c72bd6bde013ace36bcfbbc1e51a9
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 22 18:38:06 2012 +0100

    heat engine : Make Resource::swift handle auth_token
    
    Make Resource::swift() handle auth_token so the S3
    resource will work with AWS auth
    
    Fixes #271
    
    Change-Id: Ie5aca026dea25045e42aab677a2c793c79de1658
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/resources.py |   32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

commit eff1af8ae03461892fb432ebd0394f8fd88eb4c7
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Oct 19 17:23:49 2012 -0400

    Cleanup runcmd to exit 0 and not use 'type'
    
    Change-Id: I37313a772839f56a015431bbb004ad767da0815e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/cloudinit/config |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7036a387f48fb0cd5266f57fa148a32d98cd7270
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Oct 18 15:50:27 2012 +0200

    ReST API: Add a keystone endpoint
    
    Change-Id: I2770279ec50822c106d3ae23ce2f736a49139443
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-keystone-setup |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 567128f594bf45748528e610f01d90255ff0eb60
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Oct 18 16:50:53 2012 +0200

    Handle %(tenant_id)s in endpoints when updating
    
    Change-Id: I61112f02b60b6bb63f33d5459edec1f44a49bdd5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-keystone-setup |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 2e7e7c44cf52191cf54222c8256c6afcc6f00aa5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 22 11:24:59 2012 +0200

    Change the service user to match devstack
    
    The user which authenticates keystone tokens should be the "heat" user in
    the "service" tenant. This changes the default configuration to do this, as
    devstack already does.
    
    Ref #269
    
    Change-Id: I89978ec0b490f6d404c568197dd4208097a4b695
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 etc/heat/heat-api-cfn-paste.ini |    4 ++--
 etc/heat/heat-api-paste.ini     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 3bc725b5bd1ec82cc5e307d08803836d83a9e143
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 22 11:20:07 2012 +0200

    Pass the correct tenant for the service user
    
    Previously, the service user (which authenticates tokens passes to the
    engine by the APIs) was paired with the tenant of the end user to do
    authentication, which worked only when they were in the same tenant. This
    should not be the case, since the service user should only have an admin
    role in the "service" tenant.
    
    Fixes #269
    
    Change-Id: I99b764fc489429dd6d081485bd89d5dde737c124
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/auth_token.py |    1 +
 heat/common/context.py    |    9 +++++++--
 heat/engine/resources.py  |    8 +++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

commit d75075cf35907530f8211d53d89b4ffd186fe251
Merge: 5d7ebba 0816b29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 19 20:45:14 2012 +0000

    Merge "ReST API: Format output as JSON"

commit 5d7ebbaa06fa348e1e50121316580811c3f15105
Merge: c2d262e 0f108b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 19 18:37:58 2012 +0000

    Merge "Start and enable libvirtd."

commit 0f108b72dea71d9667a573d5661a301bdeec99cb
Author: Ian Main <imain@redhat.com>
Date:   Fri Oct 19 11:30:27 2012 -0700

    Start and enable libvirtd.
    
    Just did a fresh install on fedora 17 and found libvirt was not running
    by default which caused nova to not start.  Explicitly enable it.
    
    Change-Id: Id244af934007020d1a9f263dd71f04e5950dd2c5
    Signed-off-by: Ian Main <imain@redhat.com>

 tools/openstack |    2 ++
 1 file changed, 2 insertions(+)

commit c2d262e6b26d0dd14c6f6c76100e78a4154fef08
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 19 19:11:51 2012 +0100

    heat engine : Resource.keystone handle auth_token
    
    Handle auth_token as well as username/password
    
    Fixes #268
    
    Change-Id: I7015556d74e026977fdd04f4ce9a378c0fac7695
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/resources.py |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

commit 13ec48afe3aa12804cf15ad02557b1949cd52cdc
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 19 19:02:33 2012 +0100

    heat engine : Rework auth.authenticate
    
    engine.auth.authenticate is really creating a novaclient
    connection, so move this into Resource.nova
    
    Ref #268
    
    Change-Id: I15d9c0537b3af9e65cd1ea5bd667bde0c89dc4c2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/auth.py                 |   46 -----------------------------------
 heat/engine/resources.py            |   39 ++++++++++++++++++++++++++---
 heat/tests/test_api_cfn_v1.py       |    2 --
 heat/tests/test_api_cloudwatch.py   |    2 --
 heat/tests/test_api_openstack_v1.py |    2 --
 heat/tests/test_validate.py         |   12 ---------
 6 files changed, 35 insertions(+), 68 deletions(-)

commit 52968f4a16b1af85770f532f734143add807c53b
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 19 16:12:15 2012 +0100

    heat engine : remove unused EC2 style auth from engine
    
    We handle EC2 style auth at the heat-api-cfn level, so EC2
    style authenticated requests simply pass us an auth_token in
    the context, so remove this duplicate/dead code.
    
    Ref #268
    
    Change-Id: I17708cb6ef4b0eb4989d47c116b6211f0d419dcb
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/auth.py |   37 ++-----------------------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

commit 0816b2963c4c334efe65f2a0cf2748ae6bc708c0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 19 17:14:12 2012 +0200

    ReST API: Format output as JSON
    
    Eventually, both XML and JSON will be supported, but for now make the
    output JSON, the same as the input.
    
    Change-Id: If0f00b182c27616a9a6f08b468d732c718b7635a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py     |   11 +++++++----
 heat/tests/test_api_openstack_v1.py |    4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

commit 5658f9d4dbe759fe26a7b820058b8e257f796f35
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Oct 19 11:20:04 2012 -0400

    Do not assume host has selinux utils installed
    
    related to #265
    
    Change-Id: I4a6cff1f05b6f4f88d672cc0d4ce5e8f62a58e47
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/cloudinit/config |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6ea813be339f8218cef6ceaa61bbe3a698783e09
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 19 16:15:13 2012 +0200

    Identify stacks using tenant UUIDs
    
    Tenant names may come and go, but UUIDs are universally unique. Therefore,
    ownership of the stack should be keyed on the tenant_id, not the tenant
    name.
    
    Change-Id: I7ec410aeaeceb6319299935b5f34d7c4e9c63d67
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py     |    4 ++--
 heat/db/sqlalchemy/api.py           |   10 +++++-----
 heat/engine/manager.py              |    2 +-
 heat/engine/parser.py               |    4 ++--
 heat/tests/test_api_cfn_v1.py       |    2 ++
 heat/tests/test_api_openstack_v1.py |    2 ++
 heat/tests/test_engine_manager.py   |    4 ++--
 7 files changed, 16 insertions(+), 12 deletions(-)

commit debeccde8f9d3e99d2addc843d718eaf1e588dfe
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Oct 18 14:53:26 2012 -0400

    Make default distribution U10 for deb template
    
    Change-Id: Ifcfc7d1fbb6fac2a785a0dc5a4e6ba09cf898ed4
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 templates/WordPress_Single_Instance_deb.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0ee9371f0c67d2334ced2a5bec171864a4fa7374
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 17 13:37:57 2012 +0100

    heat engine : Make wait-condition poll interval better
    
    Remove rising-rate sleep-time logic and replace with a bounded
    poll interval derived from the timeout - this should avoid ramping
    up to a really long interval and delaying stack complete status
    
    Fixes #264
    
    Change-Id: Id53b87a988299708c29fc853f2801f527fd825dd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/wait_condition.py |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

commit 0c81d9dbef675c666ba1bb9d659457b3acc05e78
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 16 16:31:59 2012 +0200

    Handle upgrades in heat-keystone-setup
    
    Handle upgrades of Heat by removing any outdated endpoints that exist in
    keystone and adding any existing "heat" service user to an admin role in
    the service tenant.
    
    Change-Id: If6393417b5404a56b4723f42fb1a1b394d01cc6a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-keystone-setup |  180 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 144 insertions(+), 36 deletions(-)

commit bae47db46091c7ee2840abb264818731ed4ae099
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 17 10:33:45 2012 +0200

    Rename CloudFormation service to heat-cfn
    
    This is consistent with what is implemented in devstack.
    
    Change-Id: If47c28ddbef1d6c61e2d741f359d850e4ecffaa9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-keystone-setup |    2 +-
 heat/engine/auth.py     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 453854cdf697453376364eae51d65e3e58d82f51
Merge: a97c6d3 3308e27
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 17 08:33:13 2012 +0000

    Merge "heat tests : Remove utils.Stack getter methods"

commit 3308e276481a7160adb58b9c1cad7327543c47cc
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 17:24:53 2012 +0100

    heat tests : Remove utils.Stack getter methods
    
    Remove the get_*_client getter methods, as they aren't
    actually doing anything, so just access the attributes
    
    Change-Id: Ic6740bdfe7d44c40b9fdf9fc4d03f8eddaf9a740
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_Actions.py      |   24 ++++++-----------
 heat/tests/functional/test_CFN_API_Actions_Boto.py |   25 ++++++------------
 heat/tests/functional/test_CFN_API_UpdateStack.py  |    3 +--
 .../test_WordPress_Single_Instance_With_EBS_EIP.py |    5 ++--
 .../test_WordPress_Single_Instance_With_EIP.py     |    5 ++--
 heat/tests/functional/util.py                      |   27 ++++----------------
 6 files changed, 26 insertions(+), 63 deletions(-)

commit a97c6d3181a3d09751c3f88eee5a43e9eed0ad37
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 16 16:33:55 2012 +0200

    Use password in preference to token if both supplied
    
    Fixes #263 - devstack is providing a token in the environment, which was
    causing the wrong path to get hit.
    
    Change-Id: I9aae346e57fdfe156e52d4696e8f2f859884ff2f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/auth.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit f3ab48b64e13d681ff4d07aae67c31fb6c266683
Merge: 74b207a cd512f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 16 14:16:50 2012 +0000

    Merge "heat : heat cli pep cleanups"

commit 74b207a332d67fd530f3a87fbf83f6981e75d113
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 14:16:17 2012 +0100

    heat tests : add ValidateTemplate test to CFN_API_Actions_Boto test
    
    Add test for ValidateTemplate test to test_CFN_API_Actions_Boto.py
    
    Change-Id: I1fff55cd9aaa0c62c2a1e05050695bcd3f96664a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_Actions_Boto.py |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit da5406a043512dbc47064794d6ab1ab1e0ba228b
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 13:45:24 2012 +0100

    heat tests : Add ValidateTemplate test to CFN_API_Actions test
    
    Add test for ValidateTemplate action to test_CFN_API_Actions.py
    
    Change-Id: Ia7a377f952d096e7b728a7151906ab2781695008
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_Actions.py |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 3cbbafd3c2fd321941722eea598aead1dd3d481b
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 13:19:27 2012 +0100

    heat API : ValidateTemplate fix response format
    
    Fix CFN API ValidateTemplate response format, missing the
    ValidateTemplateResponse wrapper, required by boto to parse the response
    
    Change-Id: I89464df402346ff87041496652d2b4d39cc35fc6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/cfn/v1/stacks.py           |    3 ++-
 heat/engine/manager.py              |    2 +-
 heat/tests/test_api_openstack_v1.py |   19 ++++++++-----------
 heat/tests/test_validate.py         |    8 ++++----
 4 files changed, 15 insertions(+), 17 deletions(-)

commit cd512f5e915ff7de89c4829e45e367f9b201a3db
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 14:34:38 2012 +0100

    heat : heat cli pep cleanups
    
    Fix some pep whitespace issues, which were not picked
    up by the jenkins gate for some reason..
    
    Change-Id: I9a3488d61a3cde4bb8038f3f1927eb0c1ad0f60c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 98b6c2a566812abdb1c89e9dec51331baea5ae14
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 8 13:48:27 2012 +0100

    heat : boto_client_cloudwatch allow credentials override
    
    Allow the AWS key/secret to be passed in when making the client
    connection like boto_client.py
    
    Ref #222
    
    Change-Id: Iee24120eb52c8ffb97b1b421b0a27313e5f5cbdd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/boto_client_cloudwatch.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b1c97d145531ba3aeff055d7028ff49df13cad9e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 16 13:35:23 2012 +0200

    Catch SSH Disconnection errors in functional tests
    
    Change-Id: I24f959cbaa36138bafeda70a3966000673c80c56
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/functional/util.py |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit 46a41590fb8ebbec565e0d007c429a17d0d7f5eb
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Oct 16 10:38:17 2012 +0100

    heat : add template-swift-url option to client
    
    Add option to bin/heat to retrieve template body from swift
    
    Fixes #216
    
    Change-Id: I425d7cd0f01875d85d97906f4f91c3a3b2fcf851
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

commit 84ddb9fb654ee8cd57273110f4760f44af43be3a
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 15 16:42:52 2012 +0100

    heat cli: encapsulate template arg-parsing
    
    Encapsulate template argument parsing in a helper function
    cleans up some duplication and provides a single place to add
    swift-template-url logic
    
    Ref #216
    
    Change-Id: I36515f318ed79899a2710899ffca83e4452c61f4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat |   43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

commit 4bd5c4a9dde0afbcd31438604c3aa05799c472ce
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 15 17:01:39 2012 +0100

    heat engine : remove unused validate_template params
    
    Remove unused params argument to validate_template, since
    it is no longer passed by the CFN API meaning the validate
    action fails
    
    Fixes #262
    
    Change-Id: Ic2a5ede02649f2d6dff86595efb0127e07fbf253
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/openstack/v1/stacks.py     |    3 +--
 heat/engine/manager.py              |    2 +-
 heat/engine/rpcapi.py               |    4 ++--
 heat/tests/test_api_openstack_v1.py |   14 ++++----------
 heat/tests/test_rpcapi.py           |    2 +-
 heat/tests/test_validate.py         |    8 ++++----
 6 files changed, 13 insertions(+), 20 deletions(-)

commit ac38cae7f5352a0c2592d6789bdd5e35ca5aa900
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 15 16:33:19 2012 +0200

    Obey the passed in distro value in HAProxy template
    
    Change-Id: I7e1dad654746329763bb575a09611aa0b827ec24
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 templates/HAProxy_Single_Instance.template |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 64965db9de997d55d7599073d2a310251fc355e3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 15 16:13:12 2012 +0200

    Use --script option to parted in templates
    
    Provisioning scripts should never expect user input.
    
    Change-Id: I0099cee6a920313c2b5c8e86ddb18de11bab8329
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 templates/WordPress_2_Instances_With_EBS.template  |    4 ++--
 .../WordPress_2_Instances_With_EBS_EIP.template    |    4 ++--
 .../WordPress_Single_Instance_With_EBS.template    |    4 ++--
 ...WordPress_Single_Instance_With_EBS_EIP.template |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

commit 65496df4a9c08d0ef7fc191f192b19df39447198
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 15 15:46:49 2012 +0200

    Reduce timeout periods in functional tests
    
    Many of the timeouts were absurdly long and delayed reporting of test
    results by many hours at a time.
    
    Change-Id: I9a70442548097d607eab87471a8037b566127ac9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/functional/util.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit fdf285f4df7b4589e8801c77bdd3c3b2f57c9812
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 12 22:32:54 2012 +0200

    ReST API: Add unit tests
    
    Change-Id: Id815c7d5d08e912f64268529b4bdbdcd06c1c47e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_api_openstack_v1.py |  734 +++++++++++++++++++++++++++++++++++
 1 file changed, 734 insertions(+)

commit b3fba7da803d3c0239f7d3a27a69cd099fb6552e
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 15 11:34:52 2012 +0100

    heat : Getting started updates for Cloudwatch
    
    Update GettingStarted.rst:
    - Add heat-api-cloudwatch section
    - Add firewall rules required for heat-metadata and heat-api-cloudwatch
    
    Change-Id: I3b232f378a23b6c334c7e8e5af3ab067ffd50381
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 docs/GettingStarted.rst |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

commit 47c79a2051f7738a482bad090b894c6e480dfe7a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Oct 15 11:57:11 2012 +0200

    Getting Started: Fix IP address determination on F17
    
    The format of the output of ifconfig has changed between Fedora 16 and
    Fedora 17, so starting the metadata server failed on the latter due to a
    missing IP address.
    
    The change makes the script work with either format, and also now fails
    with an error if it breaks again.
    
    Change-Id: I7012af7bd7c15f6a962d19e66c8a0d8401243895
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b53436bf402a992cc9c135dd833bdb15465d4244
Merge: 2f2c5e7 4d262e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 15 08:57:10 2012 +0000

    Merge "heat : Remove cloudwatch functionalty from metadata server"

commit 2f2c5e7494270c9877d92b66dc6f7131ad31c710
Merge: 737f4f4 318f233
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 15 08:55:04 2012 +0000

    Merge "heat templates : Add boto config to HA templates"

commit 737f4f4320510371ceaab0ef6e528aa567e52eec
Merge: be39298 ebc3129
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 15 08:43:19 2012 +0000

    Merge "heat engine : Move watch logic into WatchRule class"

commit ebc3129e44d5762756d28133880b07a13f6e0be3
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 28 08:02:20 2012 +0100

    heat engine : Move watch logic into WatchRule class
    
    Move engine/manager.py logic into WatchRule class so watch-
    related DB manipulation and related logic is encapsulated in
    the WatchRule class
    
    Fixes #217
    
    Change-Id: I5405ab631de17efda7eefb45dadad55ee12c533c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/cloud_watch.py |   16 ++--
 heat/engine/manager.py     |  113 ++++------------------------
 heat/engine/watchrule.py   |  148 ++++++++++++++++++++++++++++++++++---
 heat/tests/test_watch.py   |  174 ++++++++++++++++++++++++++++++++++++++------
 4 files changed, 311 insertions(+), 140 deletions(-)

commit be392980ce9c450cc92a6a57ddbe2b09693e1273
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 12 22:32:54 2012 +0200

    ReST API: Report template validation errors
    
    Use a different HTTP Status code (Bad Request) for validation errors.
    
    Change-Id: Ie1097dfbbe920a2efb641b343114d7b4decac473
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit a5c7b42e23add65e4f990674f24aa9bd90725a72
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 12 22:32:54 2012 +0200

    ReST API: Return appropriate error codes
    
    Change-Id: I769366dd164199c3b7d16ca8bf4c4d99d21dbb7b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 238187ee0a9d075d1e86534a72ae2eb8e53cce26
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Oct 12 22:32:54 2012 +0200

    ReST API: Separate out code to fetch template from a URL
    
    This will make testing a bit easier.
    
    Change-Id: I8f9d63e3ff68174bb9f1284c21f52696ec5ac006
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py |   51 +++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

commit 8be0906b7aa3162d9d1435eb8ed0d8ba9c226066
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 12 17:18:11 2012 +0100

    heat : db API add watch_rule_get_by_name
    
    Add watch_rule_get_by_name, and move the previous
    watch_rule_get to look up rule by ID, which is consistent
    with the other api calls.  Lookup by id is required for
    WatchRule rework
    
    Ref #217
    
    Change-Id: I4b5d08ffcd31b6b522c65edd0a202e8cf5a367b8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/db/api.py                    |    8 ++++++--
 heat/db/sqlalchemy/api.py         |    8 +++++++-
 heat/engine/manager.py            |    6 +++---
 heat/tests/test_engine_manager.py |    2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

commit db0a268f414e963d73ded7449662385f8e5435c1
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 12 10:49:13 2012 +0100

    heat : db API add watch_rule_update DB API action
    
    Add watch_rule_update DB API call, needed for WatchRule
    refactor/rework
    
    Ref #217
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    
    Change-Id: Ie8321d390ab96e987bfa4c97c26f1e0305f6bd48

 heat/db/api.py            |    4 ++++
 heat/db/sqlalchemy/api.py |   11 +++++++++++
 2 files changed, 15 insertions(+)

commit 4d262e3b29faeb6499ca2befe52d81aea3583ef7
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Oct 12 13:45:11 2012 +0100

    heat : Remove cloudwatch functionalty from metadata server
    
    Remove the cloudwatch metric functionality from the heat-metadata
    service, since all stats should now be sent via the CloudWatch
    api via the PutMetricData action (ref cfn-push-stats update)
    
    Note that after this change you will need to rebuild your jeos
    images to get the new version of cfn-push-stats from heat-jeos
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    
    Change-Id: I5eec60d3dd0abfb32e2b4777635f1b0e2714a2c2

 heat/metadata/api/v1/__init__.py |    8 --------
 heat/metadata/api/v1/metadata.py |   19 -------------------
 2 files changed, 27 deletions(-)

commit 318f233c54c4f2046052a4a70411600e53aa847f
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 10 10:03:11 2012 +0100

    heat templates : Add boto config to HA templates
    
    Add boto config to HA/IHA templates as it's now required for
    authenticated cfn-push-stats which uses the CloudWatch API
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    
    Change-Id: I8670f6774834e9f41870240496fe74728306cf17

 .../WordPress_Single_Instance_With_HA.template     |    5 +++++
 .../WordPress_Single_Instance_With_IHA.template    |    5 +++++
 2 files changed, 10 insertions(+)

commit 5df2d6f7020c54fc7e5c9c8e68662708791e3f69
Merge: e690324 64fc539
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 10 22:17:18 2012 +0000

    Merge "ReST API: Add some simple API documentation"

commit e69032415cdaec1b9594eccaca839181d398ee43
Merge: 3e196ee a553fc2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 10 22:16:56 2012 +0000

    Merge "ReST API: Use JSON documents for data input"

commit 3e196ee0062c1084730b1429e04571761cfd4221
Merge: a7babbd 4fca773
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 10 22:14:02 2012 +0000

    Merge "ReST API: Refactor handling of input data"

commit a7babbd61f738687f5c2a0eb0b487655d2bc8e5b
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Oct 11 08:18:04 2012 +1300

    Unit test for load balancer resource type.
    
    Change-Id: I2386419563f02bcb509a8547fd587b9af6285c5c

 heat/tests/test_loadbalancer.py |  165 +++++++++++++++++++++++++++++++++++++++
 heat/tests/v1_1/fakes.py        |   29 ++++++-
 2 files changed, 191 insertions(+), 3 deletions(-)

commit abafede828fff481912bb1044e0683536468eb64
Merge: d41fe6f c0ec1c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 10 18:17:25 2012 +0000

    Merge "heat : Add missing calculate_properties to user resource"

commit d41fe6f6f018fc15fa578692b145aac4707edf63
Merge: 96c9b50 73b19cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 10 18:15:07 2012 +0000

    Merge "heat engine : Avoid printing credentials to logfile"

commit c0ec1c1dd4aaba11b11f21877e57ee113abd1fdf
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 10 18:20:25 2012 +0100

    heat : Add missing calculate_properties to user resource
    
    Adding calculate_properties to user AccessKey resource, or
    we get a key error when trying to list resources in stacks
    using this resource type
    
    Fixes #194
    
    Change-Id: I905c162dd6bc3557825610f046e6ee8228d5225b
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/user.py |    1 +
 1 file changed, 1 insertion(+)

commit 73b19cb666d70f2288a96c95cfab4bf8ed391faa
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 8 17:16:42 2012 +0100

    heat engine : Avoid printing credentials to logfile
    
    Avoid printing the AWS secret key to the (world-readable)
    engine logfile
    
    Fixes #258
    
    Change-Id: I26d809064c603421c4bbe4a060de5d4776fec4b8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/user.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 96c9b50778ab3fc36d33544e6d6510d75e09c044
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 10 18:51:20 2012 +0100

    heat engine : only attempt stack update from valid states
    
    Only attempt to update a stack if it is in CREATE_COMPLETE
    or UPDATE_COMPLETE state
    
    Fixes #260
    
    Change-Id: If47a628f1602d5d8783b3f0e90fd7e76ccef46ba
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/parser.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 64fc539afcd2adfe8d8698bb6a838a22fc3a132e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 10 18:22:01 2012 +0200

    ReST API: Add some simple API documentation
    
    Change-Id: I6b3ff5a46e0ba836634cc21cf7ee8945a18a6a3a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/api.md |  163 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)

commit a553fc2ba55170fc27f2d4e6c5b44d6570523bda
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 9 17:55:37 2012 +0200

    ReST API: Use JSON documents for data input
    
    This is more in keeping with how OpenStack resources are manipulated than
    the previous implementation, which used WWW Forms encoding.
    
    Change-Id: Iba7a6b83a65637cf999c67ef3f4dea7b3e64100d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

commit 4fca77337a4a491cb1e340d515fabc36b09ee860
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 10 15:38:04 2012 +0200

    ReST API: Refactor handling of input data
    
    Create a separate class for dealing with the data associated with a
    PUT/POST request.
    
    Change-Id: I054bc74cf65055d23eb716738c29e751a32f3022
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py |  161 ++++++++++++++++++++++-----------------
 1 file changed, 90 insertions(+), 71 deletions(-)

commit 454b2dffb6b988ca6381c9ef1a973be654921b2b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Oct 10 15:38:04 2012 +0200

    ReST API: Fix template validation
    
    Also move the URL to be local to a tenant. This is because keystone will
    automatically fill in the tenant id in the endpoint, so all requests will
    use this as a base URL.
    
    Change-Id: I3fbd5a7d256426079824f8a26fdcd41eac083146
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/__init__.py |    4 ++--
 heat/api/openstack/v1/stacks.py   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit efd529408659110806aab6de4d37b705bc840143
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Oct 10 11:57:33 2012 +0100

    heat : workaround engine error with version code
    
    Work around lack of git sha in vcsversion so we don't get an
    engine error if the version dict doesn't contain the sha key
    
    Fixes #259
    
    Change-Id: I25d2cfb008a5a9e0e1a60e7360e58608d2d8e9c0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/version.py |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

commit a34b9ef5ab0aa3590fd28cb9f8088a3e0896947f
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Oct 10 13:21:47 2012 +1300

    Change endpoint service type from orchestration to cloudformation.
    
    This is required so that the REST API can take over the orchestration service type.
    
    This will break exiting setups until heat-keystone-setup is re-run.
    
    There will be a corresponding update to devstack, which may be out of sync to this one.

 bin/heat-keystone-setup |    2 +-
 heat/client.py          |    2 +-
 heat/engine/auth.py     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit afe93704f327a4514fa826b06d275729cf214073
Merge: 2e3bdd9 4651be7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 9 16:19:50 2012 +0000

    Merge "Remove unnecessary keystone scripts"

commit 2e3bdd951028f8d0b201b9ddb2553b194a1b0941
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 28 20:00:34 2012 -0400

    Fix versioning code
    
    Removed cruft from OpenStack common versioning code that was removed.
    Added optional git SHA information if module is available. The
    intent is to have the additional git revision reported only when FINAL
    is set to False.
    
    Change-Id: Iae94b84027e7428cd394726e07845d2bad631586
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/service.py |    2 +-
 heat/version.py |   53 ++++++++++++++++++++++++++++++++++++-----------------
 setup.py        |    4 ++--
 3 files changed, 39 insertions(+), 20 deletions(-)

commit 4651be78386832b8fd1f931f9574f7566d976198
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 28 20:08:35 2012 -0400

    Remove unnecessary keystone scripts
    
    Make remaining keystone script check installed version of Nova and use
    proper arguments to keystone.
    
    closes #252
    
    Change-Id: Ie4709891c7ca89d73390a3474e3d10beab449395
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 bin/heat-keystone-setup              |   14 +++++++--
 docs/GettingStarted.rst              |    4 +--
 tools/heat-keystone-service          |   57 ----------------------------------
 tools/heat-keystone-service-devstack |   52 -------------------------------
 4 files changed, 13 insertions(+), 114 deletions(-)

commit 9cf1c6f269ac10c2493653c646bbef9271cf7122
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 9 10:37:01 2012 +0200

    Fix bugs in ReST API stack creation
    
    Change-Id: I39277224305465cc951e397f340012563c0f7174
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/openstack/v1/stacks.py |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit 3e603825a8c743e9a1e2f6f4362669cb6d187c47
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Oct 9 12:06:44 2012 +0200

    Allow authentication to Nova with a Keystone token
    
    Change-Id: I3ca90169559cc167ff51db5fe47ceec8c917f04b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/auth.py |   84 ++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 45 deletions(-)

commit 5f7ccf6129f669a757253db8ce2ce88e8f3cd228
Merge: c6ad01b 8c9bd2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 19:42:08 2012 +0000

    Merge "Make sure to remove python-glanceclient too"

commit c6ad01b6b31e08a792cf7d5cad33f01bcaa8e88e
Merge: 703693b dd6975e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 19:09:37 2012 +0000

    Merge "Fix hash-bang directive in nova_create_flavors.sh"

commit 703693b03e5cfb39a71a337e1d97a121a914a951
Merge: 0fa2903 cdd392b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 16:02:04 2012 +0000

    Merge "heat tests : add functional test for UpdateStack"

commit 0fa2903fac98b31d46e546714ea9f2c71f130837
Merge: 0549320 f8f0fac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 15:57:25 2012 +0000

    Merge "heat tests : functional utils support for UpdateStack"

commit 05493200445075782c8d5ed009ef8989d0f71ef6
Merge: 49ce173 8c191d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 15:56:55 2012 +0000

    Merge "heat tests : Add new boto API test"

commit 49ce173820ec8bd1928252a8eacb85d4373711dc
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Oct 8 16:21:25 2012 +0100

    heat engine : workaround lack of no_cache on essex
    
    no_cache novaclient fix doesn't work on essex, so try
    both the essex and the folsom compatible novaclient
    prototypes
    
    Change-Id: I0749f821981550d7a5f5a95e2f5951c77d8e1529
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/auth.py |   54 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 14 deletions(-)

commit c491afaef6c5af6e28382eaadb6fe584061f9702
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Mon Oct 8 15:20:37 2012 +0100

    Avoid create_stack RPC call timing out on precise
    
    The create_stack RPC call times out on Ubuntu as novaclient
    blocks expecting stdin when prompting for a keyring password:
    
        Please set a password for your new keyring
    
    This probably does not occur on Fedora due to the version or
    presence of the python-keyring package differing.
    
    The problem can be avoided by ensuring the no_cache flag is
    set on the novaclient.
    
    Change-Id: I3ac9e74571ff837cd07fc3f36ecf706180f4dc46

 heat/engine/auth.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit dd6975eadc7720c4dcd8624a1fb43c9ccb820259
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Mon Oct 8 12:51:17 2012 +0100

    Fix hash-bang directive in nova_create_flavors.sh
    
    The script employs bash-isms, so the directive to use the
    Bourne shell causes some predictable failures:
    
      nova_create_flavors.sh: [[: not found
    
    ... etc.
    
    Change-Id: I60f3de55d2ebbfa47d444ec72c07728bbfa38be6

 tools/nova_create_flavors.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f912bfc4d03f8c801c2b4d29bd1c9fa1a3396ced
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Oct 5 10:07:53 2012 +0100

    import gettext to fix db migration execution

 heat/common/exception.py |    1 +
 1 file changed, 1 insertion(+)

commit 8c9bd2a71b917d89cdb131669b581c0ce59e9683
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 28 20:04:16 2012 -0400

    Make sure to remove python-glanceclient too
    
    Change-Id: I44c39824f5b1d96ac69e6972506fc865718b3c59
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 tools/openstack |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cdd392ba816bfda1c866b590be051111035ab2a4
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 27 14:12:59 2012 +0100

    heat tests : add functional test for UpdateStack
    
    Add new API test to prove UpdateStack action
    
    Change-Id: I656f3965a222ee1dcd890d4e4491f5550fada461
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_UpdateStack.py |  151 +++++++++++++++++++++
 1 file changed, 151 insertions(+)

commit f8f0fac96ec086f1b2ebc6c780155a0a0caa56e7
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 26 14:37:07 2012 +0100

    heat tests : functional utils support for UpdateStack
    
    Add Stack.update method so UpdateStack API action
    can be tested
    
    Change-Id: I2fdc37b15eab9b7d786153877755a631fda0ad2a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |   38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

commit 8c191d49a1082e712dec24856f47835fcdd5b26e
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 24 17:41:23 2012 +0100

    heat tests : Add new boto API test
    
    Add new test_CFN_API_Actions_Boto.py test, which
    tests the CFN API via the boto client
    
    Change-Id: Iad796da35009fbad0ce21ba0d7ab73c2fd16cd7d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_Actions_Boto.py |  353 ++++++++++++++++++++
 1 file changed, 353 insertions(+)

commit ed998e8c287ee7290246178e0b8feb98eec95096
Merge: 2abd571 9e237f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 28 01:42:09 2012 +0000

    Merge "Add the beginnings of an OpenStack ReST API"

commit 2abd5713e1b519610a595bda31945b9c7e6dc852
Merge: 00faf05 988092b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 28 01:32:49 2012 +0000

    Merge "Unit test for DBInstance resource."

commit 00faf05e5c47c751a2118a913c967181a6ba2f6c
Merge: f26b218 642d740
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 28 01:30:34 2012 +0000

    Merge "heat tests : API test fixup for ResourceProperties"

commit 9e237f5a665042db2d592a4a0977cff933062590
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 25 16:13:35 2012 +0200

    Add the beginnings of an OpenStack ReST API
    
    So far only access to stacks (not resources and events) is implemented.
    
    Change-Id: I9655e9441087ef60c06e67e2d6ae68ec4a3b2d11
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-api                      |   57 +++++++
 etc/heat/heat-api-paste.ini       |   83 +++++++++
 etc/heat/heat-api.conf            |   27 +++
 heat/api/openstack/__init__.py    |   22 +++
 heat/api/openstack/v1/__init__.py |   81 +++++++++
 heat/api/openstack/v1/stacks.py   |  341 +++++++++++++++++++++++++++++++++++++
 heat/api/openstack/versions.py    |   59 +++++++
 heat/engine/identifier.py         |    4 +-
 heat/tests/test_identifier.py     |   12 +-
 install.sh                        |   16 --
 run_tests.sh                      |    2 +-
 setup.py                          |    1 +
 12 files changed, 680 insertions(+), 25 deletions(-)

commit 642d740b86e07ec2fc60119cb62c0dabd2a28314
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 27 15:00:50 2012 +0100

    heat tests : API test fixup for ResourceProperties
    
    Fixup CFN API functional test after ResourceProperties
    format change
    
    Change-Id: I91d88443bc885163cffafc83615aa0cfa8d3ff83
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_Actions.py |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit f26b2188319a293b4dff6a88c571215798634e85
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 27 14:40:52 2012 +0200

    Allow separate versioning of each API
    
    Previously, all APIs used single versioning definition. Since these are
    likely to change at different rates (AWS APIs are unlikely to change at
    all, but OpenStack APIs probably will), give each their own version
    definition.
    
    Change-Id: I6985205dfcb5baf6f49ad32b091d811f97d1552a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 etc/heat/heat-api-cfn-paste.ini            |    2 +-
 etc/heat/heat-api-cloudwatch-paste.ini     |    2 +-
 heat/api/cfn/__init__.py                   |   12 ++++++
 heat/api/cfn/v1/__init__.py                |    3 --
 heat/api/cfn/versions.py                   |   59 +++++++++++++++++++++++++
 heat/api/cloudwatch/__init__.py            |    8 ++++
 heat/api/cloudwatch/versions.py            |   59 +++++++++++++++++++++++++
 heat/api/middleware/version_negotiation.py |    5 +--
 heat/api/versions.py                       |   64 ----------------------------
 9 files changed, 142 insertions(+), 72 deletions(-)

commit 3c85e1941f95e30b2c592117b4b6b23cecb87bbd
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 27 14:43:34 2012 +0100

    heat API : return ResourceProperties as JSON
    
    For boto to correctly parse the API DescribeStackEvents
    action, the ResourceProperties key in the response
    must be a string, as per the AWS spec, so we encode the
    properties in a JSON blob
    
    Fixes #245
    
    Change-Id: Icd38984836a941ed4a012b06382933bb46f43c4f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/cfn/v1/stacks.py     |    2 ++
 heat/tests/test_api_cfn_v1.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 715a62d2b4fd2fd9169254835234e7861027579e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 27 14:57:50 2012 +0200

    Move CloudFormation API to heat.api.cfn package
    
    Change-Id: Ib0adf6f38da298b0b87d80272904767066b41087
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-api-cfn                |    2 +-
 etc/heat/heat-api-cfn-paste.ini |    2 +-
 heat/api/aws/ec2token.py        |    3 +-
 heat/api/cfn/__init__.py        |   14 +
 heat/api/cfn/v1/__init__.py     |   84 ++++++
 heat/api/cfn/v1/stacks.py       |  591 +++++++++++++++++++++++++++++++++++++++
 heat/api/v1/__init__.py         |   84 ------
 heat/api/v1/stacks.py           |  590 --------------------------------------
 heat/common/wsgi.py             |    2 +-
 heat/tests/test_api_cfn_v1.py   |    2 +-
 10 files changed, 694 insertions(+), 680 deletions(-)

commit e890e7d422fd07dc022b9b755a575519d849b1f8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 27 11:49:07 2012 +0200

    Make the keystone service type configurable
    
    We will eventually need to have clients for both the OpenStack and
    CloudFormation-compatible APIs, and they will need to have different
    service types.
    
    Change-Id: I06ae727c17c245ae60934bbed6e1631c7ad5fd77
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/client.py        |    3 ++-
 heat/common/auth.py   |   41 ++++++++++++++++++-----------------------
 heat/common/client.py |    6 ++++--
 3 files changed, 24 insertions(+), 26 deletions(-)

commit 988092b70b3b53c6f9277c3a208f50395b4a7e16
Author: Steve Baker <sbaker@redhat.com>
Date:   Wed Sep 26 15:53:03 2012 +1200

    Unit test for DBInstance resource.
    
    Coverage is 100% assuming you don't count the
    nested template as code.
    
    Change-Id: I846ed736d75eeef8723c33db7cae889a26049d9a

 heat/engine/dbinstance.py     |    4 --
 heat/tests/test_dbinstance.py |  120 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 4 deletions(-)

commit 5208008db047d8cda231100db817c6f0e1c190a5
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Sep 26 10:08:05 2012 -0700

    Add a Folsom specific heat-keystone-setup binary to bin
    
    Fixes issue #253
    
    Change-Id: Ie223c43c15ac806da393e3d532ef410526ac16ce
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat-keystone-setup |   56 +++++++++++++++++++++++++++++++++++++++++++++++
 setup.py                |    3 ++-
 2 files changed, 58 insertions(+), 1 deletion(-)

commit ff10a55f16f4579ad3ec9e600b8448606242fd50
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 26 16:21:33 2012 +0100

    heat engine : format stack outputs for updated stacks
    
    Fix bug where stack outputs are not formatted when
    stacks are in UPDATE_COMPLETE state
    
    Fixes #250
    
    Change-Id: I8936c8e62b8c9b1f28f09eb5b8c50eb79cb76eb2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit d9f63269f1a0205811cd84487787c8c1291a952b
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 26 14:51:08 2012 +0100

    heat : fix glanceclient deprecation warning
    
    glanceclient module name changed for F18, so do
    a conditional import which should import the correct
    version provided one is available (tested on F17/F18)
    
    Fixes #251
    
    Change-Id: I095560f29a408949a7d54795fc000c094b1d63b9
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |    5 ++++-
 heat/utils.py                 |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

commit 8f1de0c11ae7d2c357656f73590f9e3b3f73c990
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Sep 25 11:46:08 2012 +1200

    Fix test_waitcondition.py race by converting to mox.
    
    Eventlet calls and metadata state changes are now
    mocked, so there are no sleeps, and in theory no
    chance of races.
    
    Change-Id: I05fee73a8cefafe1f2bb5a4ca65c585933497475

 heat/engine/wait_condition.py    |   21 +++++-----
 heat/tests/test_waitcondition.py |   78 ++++++++++++++++++++++++++++----------
 2 files changed, 68 insertions(+), 31 deletions(-)

commit adb6adb516be589f090a15488b81c1f5ee64821a
Merge: 6e3505e aab5902
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 24 14:57:28 2012 +0000

    Merge "Rename heat/cloudformations.py to heat/cloudformation.py"

commit aab5902a1b485a27cc0a1c83559ee70fa5de76fc
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Sep 23 21:34:20 2012 -0700

    Rename heat/cloudformations.py to heat/cloudformation.py
    
    Change-Id: I1db2e5b191b35a07aa51113829d95085bfbfc8e7
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/client.py          |    2 +-
 heat/cloudformation.py  |   21 +++++++++++++++++++++
 heat/cloudformations.py |   21 ---------------------
 3 files changed, 22 insertions(+), 22 deletions(-)

commit 6e3505e33b40fa72715dbe7c200b76b8e4d5b7c2
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Sep 18 14:31:57 2012 +1200

    Trivial unit test changes
    
    - rename assertEquals to assertEqual
    - fix the swiftclient package import, which was broken
      for testing
    
    Change-Id: Icbe80ded918b9b2d089797645bf8d46a9efaf619

 heat/tests/test_eip.py |   14 +++++++-------
 heat/tests/test_s3.py  |    8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

commit 54d53d307d5378a15c627b642fae6246fe33a13d
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 24 15:26:56 2012 +1200

    Switch to in-memory sqlite for unit tests; 1500% speed improvement.
    
    All unit tests now run in 4 seconds, instead of 64 seconds on a HDD.
    
     _ENGINE global setting had to be moved into get_engine() so that migration works, otherwise get_engine() creates a new isolated in-memory database for
    every call.
    
    Other unit test speedups in this change are to stub out some eventlet sleeps
    which saves about 5 seconds.
    
    Change-Id: I3643b73dd9bd86c414934b7c78db67402587f570

 heat/db/api.py                |    2 +-
 heat/db/sqlalchemy/session.py |   35 +++++++++++++++++++----------------
 heat/tests/test_user.py       |    3 +++
 heat/tests/test_volume.py     |    8 ++++++++
 4 files changed, 31 insertions(+), 17 deletions(-)

commit 71324379f93c255f852d24e989b07aaf08358dc2
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 24 09:08:20 2012 +1200

    Move test skipping on import failure from package to function.
    
    This gives a better test output on what has been skipped and why.
    
    The unittest2.TestCase class has been removed because it is unused and
    unittest2 is not available to the gates.
    
    Change-Id: I1b5ae0845b2ef8dadc5cff42770ef062ea4e862f

 heat/tests/test_cfn.py |   15 +++++++++++++--
 heat/tests/test_s3.py  |   18 ++++++++++++++---
 heat/tests/utils.py    |   50 +++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 75 insertions(+), 8 deletions(-)

commit 2ae14776f1378fae928a83f085124b02ffb7e75b
Merge: 79e2e76 b879228
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 23 22:24:47 2012 +0000

    Merge "Get rid of gratuitous params in RPC API"

commit 79e2e764aaf31521002107978595051e94be31fa
Merge: c663b63 312ff2d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 23 22:17:15 2012 +0000

    Merge "Stop deprecation warning when creating resources directly."

commit b87922862f031483c781562cfb1bef5433bdb7e6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 21 17:12:46 2012 +0200

    Get rid of gratuitous params in RPC API
    
    For historical reasons, we were passing all of the parameters from the query
    string received by the AWS API to the engine as "params" in many calls.
    This is not required, since all of the relevant information has already
    been extracted.
    
    Change-Id: Iedec5b442ccb0b358afc8a4e06f60672890aba05
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/v1/stacks.py             |   27 +++++++-----------------
 heat/engine/manager.py            |   14 +++++--------
 heat/engine/rpcapi.py             |   32 +++++++++++++++--------------
 heat/tests/test_api_cfn_v1.py     |   41 ++++++++++++-------------------------
 heat/tests/test_engine_manager.py |   15 +++++++-------
 heat/tests/test_rpcapi.py         |   11 +++++-----
 6 files changed, 54 insertions(+), 86 deletions(-)

commit c663b6381d28303116152df02d870bf7de2b6514
Author: Steve Baker <sbaker@redhat.com>
Date:   Fri Sep 21 15:18:36 2012 +1200

    Unit test coverage for user resources, plus some user fixes.
    
    - User 'Policies' attribute removed since it shouldn't exist
    - fixed 'SecretAccessKey' attribute in AccessKey
    
    Change-Id: Iff7cf0bda074cb615045e7236f274cafa56909f6

 heat/engine/user.py     |   25 +++---
 heat/tests/test_user.py |  229 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 240 insertions(+), 14 deletions(-)

commit 36af6c7a3067ddfa893dcd4ae03830556407a9fd
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Sep 20 17:11:47 2012 -0400

    Change file to executable to get rid of rpmlint warning
    
    Change-Id: I5274c04bca9c5f089c39a241cc2ba4ea96e279ac
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 0 files changed

commit 580b0d667d318b58e584b1ee0d86cbce0a4a9ecc
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Sep 20 14:15:49 2012 -0400

    Version 6 about to be announced for release, time for v7
    
    Change-Id: Ie85008bc7acce7535268fec0a62a0fda7bbbd1ec
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d2c8b97015352da73c2dc9463f8d20c6a98dea04
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 20 18:10:29 2012 +0100

    heat : HA functional test missing import
    
    Change-Id: Ife9b85c321b41f9d838bf413734a803f858d93c8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../test_WordPress_Single_Instance_With_HA.py      |    1 +
 1 file changed, 1 insertion(+)

commit f5033cffb6ec4de1d055079f6f4cfe29e507c52f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 20 17:59:11 2012 +0100

    heat tests : convert HA test to exec_sudo_command
    
    Use exec_sudo_command to ensure sudo command works
    
    Change-Id: I9e4b25de04112f860c40604f6152f86efd937468
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../test_WordPress_Single_Instance_With_HA.py      |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 89b052aee4dd7d4399bc0f137739a2a0f86f098f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 20 16:02:27 2012 +0100

    heat tests : Fixup IHA functional test
    
    Add more prints to monitor progress and ensure
    the halt sudo command works by using the new utils
    function, workaround paramiko SSH issue
    
    Ref #246
    
    Change-Id: I656925e61b878a9f2eabfbd65bee796d9d8ee54d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../test_WordPress_Single_Instance_With_IHA.py     |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 0991ed88f25771d5adde2119c5b967cd4b397816
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 20 14:37:41 2012 +0100

    heat tests : functional tests add exec_sudo_command
    
    Add new method in the Instance class, which uses paramiko
    invoke_shell instead of exec_command, so sudo commands can
    run despite requiretty being set in our sudo config
    
    Ref #246
    
    Change-Id: I3be691167d4c757b68e589261d6f3a1263d77e69
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit 2652832ef3594329fd0afb66ec1c5d8836987c18
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 20 11:14:53 2012 +0200

    Don't fail to delete if VolumeAttachment not found
    
    Change-Id: If12b7ebbee2d71e39e49152d971c11f55badca18
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/volume.py |   37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

commit a974326cd7b72518178fa077b842b96867515aea
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 20 11:14:53 2012 +0200

    Improve debugging ability for functional tests
    
    Use proper assert*() functions so that we can get some information out of
    any failed tests.
    
    Change-Id: I92d937015562371c2b39bbcf5b9cbd2b6ca19d52
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 .../functional/test_AutoScalingMultiAZSample.py    |    6 +-
 heat/tests/functional/test_CFN_API_Actions.py      |   70 ++++++----
 .../functional/test_HAProxy_Single_Instance.py     |   16 ++-
 .../functional/test_OpenShift_Prebuilt_JEOS.py     |    6 +-
 .../tests/functional/test_WordPress_2_Instances.py |    6 +-
 .../test_WordPress_2_Instances_With_EBS.py         |    6 +-
 .../test_WordPress_2_Instances_With_EBS_EIP.py     |    9 +-
 .../test_WordPress_Composed_Instances.py           |    8 +-
 .../functional/test_WordPress_Single_Instance.py   |    4 +-
 .../test_WordPress_Single_Instance_Boto.py         |    7 +-
 .../test_WordPress_Single_Instance_With_EBS.py     |    4 +-
 .../test_WordPress_Single_Instance_With_EBS_EIP.py |    4 +-
 .../test_WordPress_Single_Instance_With_EIP.py     |    4 +-
 .../test_WordPress_Single_Instance_With_HA.py      |    4 +-
 .../test_WordPress_Single_Instance_With_IHA.py     |    6 +-
 heat/tests/functional/test_WordPress_With_LB.py    |    8 +-
 heat/tests/functional/test_WordPress_With_RDS.py   |    4 +-
 heat/tests/functional/util.py                      |  135 +++++++++-----------
 18 files changed, 159 insertions(+), 148 deletions(-)

commit 4dab6823640d51ab01d191194c98d5fcf1a46e35
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 20 11:14:53 2012 +0200

    Fix typo in test file name
    
    Change-Id: I6c55e9ca8deaab41f8ed47e09553d1ad4811d879
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 .../tests/functional/test_WordPress_2_Instances.py |   66 ++++++++++++++++++++
 heat/tests/functional/test_WordPress_2_Intances.py |   66 --------------------
 2 files changed, 66 insertions(+), 66 deletions(-)

commit 4cb19b8f437b6cdd4effed274bca51aa088787ff
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 20 08:51:02 2012 +0100

    heat tests : fixup test_CFN_API_Actions.py
    
    Fixup CFN API test following API keyname change ref #244
    
    Ref #243
    
    Change-Id: I6c235949ee6bb950d0cc5fa39391ee2b6073b0a0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_Actions.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4f558eb479eefbde404a1b422f96877d59868d23
Merge: 377a133 1721bac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 20 03:05:06 2012 +0000

    Merge "Unit tests for autoscaling resources. 100% coverage!"

commit 312ff2dfeec87aad98c0383ab465d8cc30cd7ef1
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Sep 20 14:51:48 2012 +1200

    Stop deprecation warning when creating resources directly.
    
    This change stops the following warning from being logged:
    heat/heat/engine/resources.py:141: DeprecationWarning: object.__new__()
    takes no parameters
      return super(Resource, cls).__new__(cls, name, json, stack)
    
    Change-Id: Icf6187fdcc460d9cd732ebfc0cf14390dc240c5c

 heat/engine/resources.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 377a13308a43bb7caf2635bf0da0c7e9ab05800e
Author: Steve Baker <sbaker@redhat.com>
Date:   Thu Sep 20 12:05:48 2012 +1200

    Unit tests for volumes and attachments
    
    Change-Id: Id8f1bab9d4cb782830e38a30a6411095d3710273

 heat/engine/volume.py     |    1 -
 heat/tests/test_volume.py |  223 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 223 insertions(+), 1 deletion(-)

commit a1ff5662bfa1e3e3c8f53d47ac6b6d18f00d556c
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 19 15:56:26 2012 -0400

    Update another embedded template to F17
    
    Change-Id: I4244c98f72bd38afe6d6cd0c7a64aa69b79b578d
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/engine/dbinstance.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ed64506fcf4df813bef01f047fe64f5c6276f116
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 19 14:56:37 2012 -0400

    Changed embedded loadbalancer template to use F17
    
    Change-Id: I7d06045198add18b020736c9e019e848592c7d60
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/engine/loadbalancer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 722da7e22c2c9263fd3d4d5a8dd2c0c88d8fc4b2
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 19 16:12:52 2012 +0100

    heat API : fix wrongly named key for stack events
    
    We return a key of "ResourceStatusData", should be "ResourceStatusReason"
    
    Fixes #244
    
    Change-Id: I692825b0c800815777e9f73bd7060a108e16e45a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py         |    2 +-
 heat/tests/test_api_cfn_v1.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 89a3cf01e8211df96a0e58d31d73746c1d8b6d84
Merge: 09f2744 ed282f0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 19 15:10:45 2012 +0000

    Merge "Fix scoping issue"

commit 09f2744c8e8eb9e31b91176acaa63957163b5be0
Merge: 73a8743 9c2bd62
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 19 15:09:21 2012 +0000

    Merge "Make instance match expected name"

commit 73a87433678f04b99a566340934b2f3f2557c8bc
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 19 11:48:29 2012 +0100

    heat : ensure DB user creds aren't written decrypted
    
    Return the decrypted user_creds record as a dict copy
    and do not decrypt the credentials direct into the
    sqlalchemy model object, or we can inadvertently
    end up committing decrypted credentials to the DB
    
    Ref #218
    
    Change-Id: I0df9afcb271804557c94cdf0c913f7a26affdc83
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/db/sqlalchemy/api.py |   12 +++++++-----
 heat/engine/manager.py    |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

commit ed282f09ccb1ebbe56f5bfd1366099424633bd0d
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 19 00:41:37 2012 -0400

    Fix scoping issue
    
    Change-Id: I03ed3e503b7888591dd10c647296792f24679743
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 .../test_WordPress_2_Instances_With_EBS_EIP.py     |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 9c2bd6216f7cfb1215dadcda3a6e15795006fb50
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 19 00:01:12 2012 -0400

    Make instance match expected name
    
    Change-Id: Ic94cf389306ac45679601bcdcfbef98bc83e2453
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 .../test_WordPress_Composed_Instances.py           |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 52f5d7c7fed085d695089cd8fbba8b70c7142964
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Sep 18 22:19:59 2012 -0400

    Look for instance name that matches template
    
    Change-Id: I8963b36fa4c4530cfec9c388c5758812d7d1bddc
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 .../test_WordPress_Single_Instance_With_EBS_EIP.py |   12 ++++++------
 .../test_WordPress_Single_Instance_With_EIP.py     |   10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

commit cd47a395afce13d060434540f1900fec9753d631
Merge: 71eeb88 77a31d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 17:14:24 2012 +0000

    Merge "Implement test_AutoScalingMultiAZSample.py"

commit 71eeb8882537e0daee8daf74fd593cdf84a07e82
Merge: 31c1eb9 66aa7c3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 17:11:38 2012 +0000

    Merge "Tag functional tests with the JEOS required"

commit 31c1eb907c5c7e484017c4e5bd15593f2e9bd708
Merge: fa9905d 3a850df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 17:06:31 2012 +0000

    Merge "Make automated scripts quieter"

commit fa9905d87a51fb1ff8bf311c31ba1621c67a9046
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Sep 18 09:49:46 2012 -0700

    Provide full URL address in AutoScalingMultiAZSample.template
    
    Fixes issue #242
    
    Change-Id: Iafcf32f22f7a59ce08473981c7ff332bb1eb47f8
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/AutoScalingMultiAZSample.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 66aa7c33692399c96834915b99ad805b99b7f670
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 18 17:59:51 2012 +0200

    Tag functional tests with the JEOS required
    
    Change-Id: Ie0204d5382d402058b5538884d42512e724e94db
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/functional/test_CFN_API_Actions.py      |    2 +-
 .../functional/test_HAProxy_Single_Instance.py     |    3 ++-
 .../functional/test_OpenShift_Prebuilt_JEOS.py     |    3 ++-
 .../test_WordPress_2_Instances_With_EBS.py         |    2 +-
 .../test_WordPress_2_Instances_With_EBS_EIP.py     |    2 +-
 heat/tests/functional/test_WordPress_2_Intances.py |    2 +-
 .../test_WordPress_Composed_Instances.py           |    2 +-
 .../functional/test_WordPress_Single_Instance.py   |    2 +-
 .../test_WordPress_Single_Instance_Boto.py         |    3 ++-
 .../test_WordPress_Single_Instance_With_EBS.py     |    2 +-
 .../test_WordPress_Single_Instance_With_EBS_EIP.py |    2 +-
 .../test_WordPress_Single_Instance_With_EIP.py     |    2 +-
 .../test_WordPress_Single_Instance_With_HA.py      |    2 +-
 .../test_WordPress_Single_Instance_With_IHA.py     |    2 +-
 heat/tests/functional/test_WordPress_With_LB.py    |    2 +-
 heat/tests/functional/test_WordPress_With_RDS.py   |    2 +-
 16 files changed, 19 insertions(+), 16 deletions(-)

commit 3a850dfe3287b82fc0850ef9056a5a9de6cfd6d9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 18 18:01:56 2012 +0200

    Make automated scripts quieter
    
    This eliminates a lot of not-very-interesting stuff from the test logs.
    
    Change-Id: I20bd90f8875645ef02ce3423a555c523b62ca4e3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |   10 +++++-----
 tools/openstack         |    8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

commit 77a31d31b226e081b6dc9a1681f61aeb22a0926f
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Sep 17 17:49:32 2012 -0700

    Implement test_AutoScalingMultiAZSample.py
    
    Fixes issue #200
    
    Change-Id: Iaea2d01a9659c703986d009fb9c0605ba6d0279f
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../functional/test_AutoScalingMultiAZSample.py    |   81 ++++++++++++++++++++
 heat/tests/functional/util.py                      |    7 ++
 2 files changed, 88 insertions(+)

commit 2af388ae9c6fdad8972f036b5bcdeb79ca05a8df
Merge: 15e02a2 28b4d3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 16:01:32 2012 +0000

    Merge "Remove unnecesssary nova constructor calls in each manager API call path"

commit 15e02a245e719d440d0152e0ea264e362536fb3b
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 18 15:59:04 2012 +0100

    heat engine : loadbalancer add missing calculate_properties()
    
    Add calculate_properties() call to ensure the user defined parameter
    values are correctly updated in self.parameters
    
    Ref #241
    
    Change-Id: I7f4ec0ac546a5599359b6aa2e713ea1b6051ff34
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/loadbalancer.py |    1 +
 1 file changed, 1 insertion(+)

commit 84c04e38731d2d49e55f754e5ffeeb117c8b74f2
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 18 13:28:49 2012 +0100

    heat engine : convert stack resource to physical_resource_name
    
    Covert stack.Stack to use physical_resource_name or nested stack
    references are not fully-qualified
    
    Ref #241
    
    Change-Id: I6e38a7de5af5fe79ddc62cfee9dfe26cae30df6c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/stack.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit fd2c75938abbcb2eb434efaa4d3114c76288d7d6
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 18 13:15:06 2012 +0200

    Return exit code rom run_tests.sh
    
    Change-Id: Iddec2eb8e552f88bd04657536df094355b96b804
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 run_tests.sh |    5 +++++
 1 file changed, 5 insertions(+)

commit 84da9d441df3edbc0ae0fb2f46fcdd31aa413362
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Sep 18 13:31:37 2012 +0200

    Avoid test runner crash when we have no tty
    
    Change-Id: I6dac94a98b9125d3371c19fa14a0de9b4e766820
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/testing/runner.py |    1 -
 1 file changed, 1 deletion(-)

commit 1721bac83097291b52d05e1fa9ba8c713ab93551
Author: Steve Baker <sbaker@redhat.com>
Date:   Tue Sep 18 14:30:00 2012 +1200

    Unit tests for autoscaling resources. 100% coverage!
    
    Change-Id: Idff792aa4898b14f3a55b5b44e6133cdcf496e97

 heat/engine/autoscaling.py     |    6 --
 heat/tests/test_autoscaling.py |  171 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+), 6 deletions(-)

commit 86c76940078506aa5b6610511f6763a1b2267733
Merge: 85cd0f0 f309e51
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 00:42:28 2012 +0000

    Merge "Use stack_identity where it has changed from stack_name."

commit 85cd0f09743c42f4ba05cb8a8db7185486a48db5
Merge: fbcf37f 2080423
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 00:41:37 2012 +0000

    Merge "Tests EIP resource creation and association."

commit fbcf37f17a9c244e4e18f736f4fc0c701d952e2e
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 23:23:49 2012 +0100

    heat tests : New wordpress IHA functional test
    
    Add new test_WordPress_Single_Instance_With_IHA test
    
    Fixes #213
    
    Change-Id: Ibacfe4d5eb57c470a3e2a000ec794adfb432c081
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../test_WordPress_Single_Instance_With_IHA.py     |  101 ++++++++++++++++++++
 1 file changed, 101 insertions(+)

commit 2080423d2eaab34b804cdab6f8a24828979ba2b0
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 17 14:07:08 2012 +1200

    Tests EIP resource creation and association.
    
    Change-Id: I3af9556930a447eeba6e3152d004ddae7999d638

 heat/tests/test_eip.py |  141 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)

commit d81d3406ba375b1ad35d2330b0b1015e16436c8e
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Sep 17 12:57:27 2012 -0700

    Allow linux distribution to be passed to multiaz template for test case
    
    Change-Id: I054c3ad72cea2727dd8f5956166d753fff7363e7
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/AutoScalingMultiAZSample.template |   35 +++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

commit c5d512465979d0c3851352736ca0acc7091722a6
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Sep 17 12:51:21 2012 -0700

    Fix backtrace when using loadbalancer
    
    Loadbalancer incorrectly tried to reference a string as an integer.
    
    This resulted in the following typeerror which is repaired by
    thi patch:
    
        timeout_check = 'timeout check %ds' % (health_chk['Timeout'])
    TypeError: %d format: a number is required, not unicode
    
    Fixes issue #240
    
    Change-Id: I7e2697200d3fa9b0cb009f3a7898d487b70fc23a
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/loadbalancer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 77864991de744096976936eebaf61d0f7fd4440e
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Sep 17 12:09:59 2012 -0700

    Fix spelling errors in loadbalancer which resulted in template not launching
    
    Fixes issue #239
    
    Change-Id: I20f685598b90a40ed0452af8b7c018a1bf7e0492
    Signed-off-by: Steven Dake <sdake@redhat.com>
    Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>

 heat/engine/loadbalancer.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 28b4d3e37ccf1adffa0d3327736964d03dc6c472
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Sep 16 12:40:02 2012 -0700

    Remove unnecesssary nova constructor calls in each manager API call path
    
    auth.authenticate() creates a nova client object.  This nova client
    object is never reused introducing a 40msec penalty for each API call.
    The heat-api-cfn module authenticates incoming requests.  In a
    properly secured environment (one where RPC is secured), the
    auth.authenticate() calls serve no purpose.
    
    Change-Id: I847af259f521a32a7bf3fda0ce3f72735f762a0c
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/auth.py               |    6 ++++--
 heat/engine/manager.py            |   26 --------------------------
 heat/tests/test_engine_manager.py |    3 ---
 3 files changed, 4 insertions(+), 31 deletions(-)

commit 37def2b2df7d945fe4300de893489c9364e2762b
Author: Ian Main <imain@redhat.com>
Date:   Mon Sep 17 12:12:24 2012 -0700

    Fix up tags
    
    Fix the remaining tags to include the template.
    
    Change-Id: I307d2a7a2678617f38ad3329b51855d5ca6614c2
    Signed-off-by: Ian Main <imain@redhat.com>

 .../test_WordPress_Composed_Instances.py           |    3 ++-
 .../test_WordPress_Single_Instance_With_EBS_EIP.py |    3 ++-
 .../test_WordPress_Single_Instance_With_EIP.py     |    3 ++-
 heat/tests/functional/test_WordPress_With_RDS.py   |    3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

commit e32feeb448b388d31ac27e76e5bbad82b0e2d112
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Sep 17 10:41:41 2012 -0700

    Fix test_WordPress_2_Instances_With_EBS.py
    
    Change-Id: Iee70c20b4dc771da5cc84bcfe7bb1cd1ba5280d1
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../test_WordPress_2_Instances_With_EBS.py         |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 754fe2861ef4a739830de1a95fe27ed701ca8b69
Merge: a7a9fe5 e1c0b4e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 17 16:41:34 2012 +0000

    Merge "Change templates to launch F17 (not F16) by default"

commit e1c0b4eafcbefc441b105298afca69450bb13694
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 17 17:46:45 2012 +0200

    Change templates to launch F17 (not F16) by default
    
    Change-Id: If8b97e85f2dca5251145a8eebb184e43e25a34ea
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_api_cfn_v1.py                      |    8 ++++----
 heat/tests/test_engine_manager.py                  |    2 +-
 heat/tests/v1_1/fakes.py                           |    4 ++--
 templates/MySQL_Single_Instance.template           |    2 +-
 templates/PuppetMaster_Single_Instance.template    |    2 +-
 templates/WordPress_2_Instances.template           |    2 +-
 templates/WordPress_2_Instances_With_EBS.template  |    2 +-
 .../WordPress_2_Instances_With_EBS_EIP.template    |    2 +-
 templates/WordPress_And_Http.template              |    2 +-
 templates/WordPress_Composed_Instances.template    |    2 +-
 templates/WordPress_Single_Instance.template       |    2 +-
 .../WordPress_Single_Instance_With_EBS.template    |    2 +-
 ...WordPress_Single_Instance_With_EBS_EIP.template |    2 +-
 .../WordPress_Single_Instance_With_EIP.template    |    2 +-
 .../WordPress_Single_Instance_With_HA.template     |    2 +-
 .../WordPress_Single_Instance_With_IHA.template    |    2 +-
 templates/WordPress_Single_Instance_deb.template   |    2 +-
 templates/WordPress_Single_Instance_gold.template  |    2 +-
 templates/WordPress_With_LB.template               |    2 +-
 templates/WordPress_With_RDS.template              |    2 +-
 20 files changed, 24 insertions(+), 24 deletions(-)

commit a7a9fe515cecc44fde6864a4e6c5e257f68b46a2
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 16:57:46 2012 +0100

    heat tests : add HAProxy functional test
    
    Add new test_HAProxy_Single_Instance.py functional test
    
    Fixes #202
    
    Change-Id: I34818756dc5d8ac1f42302118eaa630348946d38
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../functional/test_HAProxy_Single_Instance.py     |   83 ++++++++++++++++++++
 1 file changed, 83 insertions(+)

commit 96af1144b08d9d08d54528c37e9dc0d5e0c23bb5
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 16:56:36 2012 +0100

    heat templates : add LinuxDistribution parameter to HAProxy
    
    Add LinuxDistribution section and mappings to HAProxy template,
    to align with other templates and for compatibility with functional
    test infrastructure
    
    Change-Id: Ib86ac4f587aebf712df1c9ad09cebc44f853e114
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 templates/HAProxy_Single_Instance.template |   30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

commit 81e835841c9f63a5c6f5a7dc1ef0732493fce3d4
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 16:54:23 2012 +0100

    heat tests : functional tests allow non-default stackname
    
    Allow the default "teststack" to be overridden, so multiple
    stacks can be created in one test
    
    Change-Id: I09a4128b98df7af6c6b85552ac2175919a697c50
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 0ad5ab9748e49196b4105528b6634213b4e596c2
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 17 16:53:09 2012 +0200

    Switch to Fedora 17 on guests in Getting Started
    
    Change-Id: I24ff5305876d91828e15f89e363d03bbf6bed923
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit c53b4fb733407c92f076faae6629a608aa3f26a2
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 10:59:56 2012 +0100

    heat : Show user parameter values in heat describe
    
    Return an agregate set of stack parameters via heat describe
    and underlying engine show_stack call, so we see the template
    parameters, and any user-overridden values (ie don't just show
    the template defaults, which is not really very useful)
    
    Fixes #238
    
    Change-Id: Ia2cc3271f0dcf8c986e968bc21775d31ecbe6228
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py                         |    2 +-
 heat/engine/api.py                            |    2 +-
 heat/tests/functional/test_CFN_API_Actions.py |   11 ++++++-----
 heat/tests/test_api_cfn_v1.py                 |   24 ++++++++++++------------
 4 files changed, 20 insertions(+), 19 deletions(-)

commit fdbd64dd2d0f364c0fd4a510ae4e124855a17eae
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 17 10:45:53 2012 +0100

    heat tests : expose keyname from Stack object
    
    Expose keyname via Stack.keyname so it can be acccessed in tests
    
    Change-Id: I7bca1acad150647d525c0a51f4ce75b0ba21050d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 42f2fd86f3942529afe5c21a128c30fe7cf76c89
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 17 11:46:11 2012 +0200

    Work around nova-network launch issue harder
    
    Change-Id: Ia1bf8cb2f0e23755100713c1289baa371bbfb956
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/openstack |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 397488959fca2fb74c9d6851941dae601fa3e1c1
Merge: 8df32a9 1a98136
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 17 07:46:00 2012 +0000

    Merge "Use openstack.common.timeutils.isotime()"

commit f309e5190062f938e0fdcc14b433c87d858b52de
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 17 13:11:59 2012 +1200

    Use stack_identity where it has changed from stack_name.
    
    This is causing my test_rpcapi to fail.
    
    Also, attempt to enable test_rpcapi by setting
    @attr(tag=['unit', 'rpcapi'])
    
    Change-Id: Ie831ddddaccc4245a18e5bc754cbf413cea65741

 heat/engine/rpcapi.py     |    6 +++---
 heat/tests/test_rpcapi.py |   21 ++++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

commit 8df32a93d2efa66905ab85260ee03c6f2ba0b227
Author: Steve Baker <sbaker@redhat.com>
Date:   Mon Sep 17 12:03:05 2012 +1200

    Unit test S3 Bucket resource with associated fixes.
    
    Change-Id: Ib23ed500385c299247bf80062a7a4342f5afe1d2

 heat/engine/s3.py                     |   17 ++-
 heat/tests/test_s3.py                 |  237 +++++++++++++++++++++++++++++++++
 templates/S3_Single_Instance.template |   18 ++-
 3 files changed, 260 insertions(+), 12 deletions(-)

commit 1a98136a64be413f63044312df40ad459b5a0262
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Sep 16 17:00:56 2012 -0700

    Use openstack.common.timeutils.isotime()
    
    Remove heat_utils.strftime() and replace callers with
    openstack.common.timeutils.isotime().  They do similar activites, and
    since its carried in common, makes more sense to use that version.
    
    Change-Id: Icd919fb218a5f97be103eda7814a5fb56e1b0a02
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/common/utils.py |   15 ---------------
 heat/engine/api.py   |   16 ++++++++--------
 2 files changed, 8 insertions(+), 23 deletions(-)

commit 77700c10bf6187b4cf0f84d82309d499134d0a7c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Sep 16 20:49:05 2012 +0200

    Work around nova-network launch issue
    
    Launch nova-network *after* nova-cert to work around the SELinux error in
    https://bugzilla.redhat.com/show_bug.cgi?id=857747
    
    Change-Id: I2ca4af4b950cca92cdd2785c493d8453648ccbb0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/openstack |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 137e3592223f5a4f4591cf30e1bc197b4058da8c
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 14 21:52:15 2012 -0400

    Change rpc cleanup to occur before killing engine thread
    
    This bug only manifested itself after a heat request was made to the
    engine. Once a request was made a Qpid connection handler continued
    to wait in a select call, presumably for a subsequent request. Closing
    the connection immediately after detecting a keyboard interrupt and then
    terminating the thread yields a clean shutdown with no traceback.
    
    Closes #176
    
    Change-Id: Ifdb82d33a6c52a004bbd6b08c564264f4140e800
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/service.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 1650f849fb09bbb521360b352248f63c26b1752e
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Sep 14 01:44:37 2012 -0400

    Add new OpenShift test
    
    New utility functions added to add/remove host file entries.
    
    Closes #204
    
    Change-Id: I182b451a25e22a558d1b4073e981cdc826ab836d
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 .../functional/test_OpenShift_Prebuilt_JEOS.py     |   66 ++++++++++++++++++++
 heat/tests/functional/util.py                      |   23 +++++++
 2 files changed, 89 insertions(+)

commit e5ce50eaf39feda335d2c5d620297aeb4ea9fbe1
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 13 18:11:10 2012 +0100

    heat tests : new functional test for CFN API
    
    Add new test which tests most actions of the CFN API
    note UpdateStack, ValidateTemplate and EstimateTemplateCost
    are still TODO
    
    Change-Id: I814508871ddd81495f5d41d38e8e724ab4d03765
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_CFN_API_Actions.py |  402 +++++++++++++++++++++++++
 1 file changed, 402 insertions(+)

commit d0c394542c1d5ba96da98c47a7468f0e92c678e2
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 13 10:59:17 2012 +0100

    heat tests : Update test_WordPress_With_RDS
    
    Update test_WordPress_With_RDS.py to use new test infrastructure
    
    Change-Id: Iea78e4d2507f0f59db3528b475e6981ea027a617
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_WordPress_With_RDS.py |   43 +++++++++++-----------
 1 file changed, 22 insertions(+), 21 deletions(-)

commit 4481b66624904e9d04bb91a02b658c4690dedfac
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 14 13:36:45 2012 +0100

    heat tests : remove duplicate cleanup Wordpress_Boto
    
    Remove the duplicate cleanup call, should only be in tearDown
    fixture
    
    Change-Id: I43cbe28694b248550689be08522d9774a38e6f64
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../test_WordPress_Single_Instance_Boto.py         |    2 --
 1 file changed, 2 deletions(-)

commit ef809d370a4c28a77d7d28fe54124d06075ceae2
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 14 11:59:58 2012 +0100

    heat tests : bugfix utils cleanup function
    
    end state for stacks is DELETE_COMPLETE, but then they
    are deleted, hence we need to test for either DELETE_COMPLETE
    or a null result to avoid false failures
    
    Change-Id: I7e35c5a734d1005fa38d587353cbca5b911ec77b
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |   32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

commit 8357920281c017f316b1fc214ddb621efa5bc667
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Sep 14 10:34:35 2012 +0100

    heat tests : bugfix utils cleanup
    
    Initialize tries variable or we get a referenced before
    assignment error
    
    Change-Id: Ic8eb68ced893fb89844e81e895c766e8f8b04bee
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |    1 +
 1 file changed, 1 insertion(+)

commit f397d7ad5292689ce106dd7de9579651a6d2be4c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 13 21:40:49 2012 +0200

    tests: Wait for delete completion
    
    Wait for the stack to actually be deleted before ending the test.
    
    Fixes #233
    
    Change-Id: I4f2060ff73615bcb16ac9cba3d7062117cca08dd
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/functional/util.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit ab754ba493a282c0790e72a73d0f09d26cb50cf3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 12 16:12:45 2012 +0200

    tests: Clean up after a failed functional test
    
    Ensure that whenever a stack is created, we delete it after the test by
    putting the cleanup() call into the tearDown() method. For this to work,
    we must also move the actual creation into the test itself, since an
    exception during setUp() will mean that tearDown is not called.
    
    Change-Id: I481e691f07c1af9e931258d7ba4453b2037c62ad
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 .../test_WordPress_2_Instances_With_EBS.py         |   15 ++++++++++-----
 .../test_WordPress_2_Instances_With_EBS_EIP.py     |   17 +++++++++++------
 heat/tests/functional/test_WordPress_2_Intances.py |   15 ++++++++++-----
 .../test_WordPress_Composed_Instances.py           |   16 ++++++++++++----
 .../functional/test_WordPress_Single_Instance.py   |   10 +++++++---
 .../test_WordPress_Single_Instance_Boto.py         |    9 ++++++++-
 .../test_WordPress_Single_Instance_With_EBS.py     |   10 +++++++---
 .../test_WordPress_Single_Instance_With_EBS_EIP.py |   10 +++++++---
 .../test_WordPress_Single_Instance_With_EIP.py     |   10 +++++++---
 .../test_WordPress_Single_Instance_With_HA.py      |   11 +++++++----
 heat/tests/functional/test_WordPress_With_LB.py    |   13 ++++++++++---
 heat/tests/functional/util.py                      |   17 ++++++++++++-----
 12 files changed, 108 insertions(+), 45 deletions(-)

commit e7bd43657d7f0f881b66ae1eec4c87cfbe57923c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 13 17:42:34 2012 +0200

    tests: Make StackBoto inherit more from Stack
    
    Change-Id: Ie2b6f2e6dd7d3f75622422d68449972ee7eceb00
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/functional/util.py |  111 ++++++++++-------------------------------
 1 file changed, 27 insertions(+), 84 deletions(-)

commit f5dfdff4b8eedc25af8c329ecc5e5490aec9a5ff
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 13 20:56:48 2012 +0200

    tests: Fail promptly on stack creation failure
    
    Fix the functional tests to report failure as soon as stack creation fails,
    rather than waiting 80+ minutes to time out.
    
    Change-Id: Ie48a84c7bb3ab274337297cc740b78d58d8ed4a6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 .../test_WordPress_Single_Instance_With_EBS_EIP.py |    2 +-
 .../test_WordPress_Single_Instance_With_EIP.py     |    2 +-
 heat/tests/functional/util.py                      |   54 ++++++++++++++------
 3 files changed, 39 insertions(+), 19 deletions(-)

commit ed33a8dc90468f2873a4a581c22027f10d9393d4
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 13 11:36:31 2012 -0700

    Add Wordpress_2_Instances testcase
    
    Fixes Issue #205
    
    Change-Id: Ic7a08b2ac278a032033bec47bbfe53aeb11b253e
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/tests/functional/test_WordPress_2_Intances.py |   61 ++++++++++++++++++++
 1 file changed, 61 insertions(+)

commit d17039840e171370bfd7e233c49719f0cd76d4bb
Merge: ec0f4ef 0660460
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 13 17:56:15 2012 +0000

    Merge "Add test_WordPress_2_Instances_With_EBS_EIP.py"

commit 06604600fbdb6d69ebe7e2e13a647ba3915e7b91
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 13 10:13:58 2012 -0700

    Add test_WordPress_2_Instances_With_EBS_EIP.py
    
    This work is based upon Tomas Sedovic's work.
    
    A floating ip checker is added to instance() in util.py
    
    Change-Id: I138a5f7bc0c5d04bc5308a80113f3057440578b9
    Signed-off-by: Steven Dake <sdake@redhat.com>
    Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>

 .../test_WordPress_2_Instances_With_EBS_EIP.py     |   84 ++++++++++++++++++++
 heat/tests/functional/util.py                      |   34 +++++---
 2 files changed, 105 insertions(+), 13 deletions(-)

commit ec0f4efd32b66a883680c707e5c0c32f82f7d847
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 12 12:07:51 2012 +0100

    heat tests : functional test utils add response_xml_item
    
    Add response_xml_item method to Stack, which allows stack
    API XML responses to be more easily parsed base on xpath
    prefix and keyname
    
    Change-Id: I96437bd7ff4575e9262d46c4c21f4408041e147d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |   13 +++++++++++++
 1 file changed, 13 insertions(+)

commit 411656a5d6b29ccbbf4bf1157c0c89e7f3cd6b4e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 13 17:50:29 2012 +0200

    Fix timing issue in starting openstack-network
    
    Change-Id: I31f3092f95b140015d661ebd86bd1567c607f3d4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/openstack |    1 +
 1 file changed, 1 insertion(+)

commit dad88e25b1abcb7e123c1a13205107fb793ac4a2
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 13 07:17:24 2012 -0700

    There is no spoon take 2
    
    ugh
    
    Change-Id: I746c721ed779b1c63592fa0e07053d27ef4231a0
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a4fdfd41195efcadc67f598b223f3691b63848bc
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 13 06:59:03 2012 -0700

    There is no spoon
    
    There is no name, only resource_name.
    
    Change-Id: I1455d497c68fb650d3aef0f1232872f441005c0d
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5553ac7ad6e0951cd8b31474eaf25c2512c71e4b
Merge: 4063e2d 614287a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 13 13:19:07 2012 +0000

    Merge "heat : Revert "Make sure the properties are defined in all cases.""

commit 4063e2d70f0a864f011a0d998b3585974f7701bd
Merge: b4287c2 38e3b5a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 13 13:18:58 2012 +0000

    Merge "heat : bugfix convert User resource to physical_resource_name()"

commit b4287c209ec53e6ae6209fc203cb928b4b03fb20
Merge: da37711 61ba35b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 13 11:56:15 2012 +0000

    Merge "Update openstack-common"

commit 614287a9645ab6b32fe9fc71a99a1a7308bf61d3
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 13 12:01:03 2012 +0100

    heat : Revert "Make sure the properties are defined in all cases."
    
    bugfix : backout #194 fix as it breaks RDS (or maybe all resoures
    implemented as nested-stacks)
    
    This reverts commit ae0b853499296763dae77aa5c1e4c22225674489.
    
    reopens #194
    
    Change-Id: I349a1625a040e33e080549a137824d1d2cfca9f8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/parser.py |    3 ---
 1 file changed, 3 deletions(-)

commit 38e3b5a24a026e0fa087db9ade14182af752d377
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 13 11:27:15 2012 +0100

    heat : bugfix convert User resource to physical_resource_name()
    
    engine user.py needs the self.name references changed to
    self.physical_resource_name() to align with the recent resource
    naming changes.
    
    Change-Id: I4620a4afc5e9c11d7b6d9348aaac35bcfa31bbac
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/user.py |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

commit da37711c68d885bf883b49aec3ce05917e9c5bbd
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Sep 12 22:43:30 2012 -0700

    creating instances failed as a result of regression in last commit
    
    The previous commit to the tree organizes resource names by
    stack.resource.  Most of the openstack APIs take resource ids
    but the instance create operation requires text identifiers.
    
    Rewrite the text identifiers for the nova security groups before
    starting an instance.
    
    Change-Id: I8a842868781ecb353f66b5a4e3d022766a4c8a0e
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/instance.py  |    7 ++++++-
 heat/engine/resources.py |    6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

commit 61ba35be90d0241b066badb0149b0a5dd8c5528b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Sep 13 13:50:24 2012 +1000

    Update openstack-common
    
    Change-Id: I002574a60b4f59543bc6aa73256c2f0b3b79d378
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/openstack/common/cfg.py                      |   90 ++++++++++++++++-----
 heat/openstack/common/exception.py                |    1 -
 heat/openstack/common/excutils.py                 |    4 +-
 heat/openstack/common/importutils.py              |    2 +-
 heat/openstack/common/jsonutils.py                |    6 +-
 heat/openstack/common/log.py                      |   79 +++++++++---------
 heat/openstack/common/notifier/api.py             |   75 ++++++++++++-----
 heat/openstack/common/notifier/log_notifier.py    |    4 +-
 heat/openstack/common/notifier/rabbit_notifier.py |    6 +-
 heat/openstack/common/rpc/__init__.py             |   12 ++-
 heat/openstack/common/rpc/amqp.py                 |    8 ++
 heat/openstack/common/rpc/common.py               |    8 +-
 heat/openstack/common/rpc/impl_kombu.py           |   13 +--
 heat/openstack/common/rpc/impl_qpid.py            |   19 ++---
 heat/openstack/common/rpc/impl_zmq.py             |   39 ++++-----
 heat/openstack/common/rpc/proxy.py                |   12 ++-
 heat/openstack/common/setup.py                    |    5 +-
 heat/openstack/common/timeutils.py                |   23 +++++-
 heat/openstack/common/utils.py                    |   45 ++++++++++-
 19 files changed, 301 insertions(+), 150 deletions(-)

commit 04701a275f9712865bc5b7ea458bb7123f3a34d7
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Sep 12 15:12:50 2012 -0700

    Make physical resource names unique based upon stack name
    
    Some templates use the same resource name when registering with
    nova.  Nova will not allow mulitple resource names to register
    with the same name in all cases, and in those it does, it often
    becomes confused (in the case of EIP).  This patch creates a
    dot notation
    
    For the LB test, an example of the resources would be:
    teststack.LoadBalancer.LB_instance
    teststack.DatabaseServer.MySqlDatabaseServer
    teststack.WikiServerOne
    
    Fixes Issue #160
    Fixes Issue #136
    
    Thanks to asalkeld@redhat.com for helping sort out the unit
    test cases.
    
    Change-Id: I14f4551feb41c7f98caa30dd98f997da6d00c467
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/instance.py                         |    3 ++-
 heat/engine/resources.py                        |    3 +++
 heat/engine/s3.py                               |    2 +-
 heat/engine/security_group.py                   |    3 ++-
 heat/engine/stack.py                            |    2 +-
 heat/engine/user.py                             |    3 ++-
 heat/engine/volume.py                           |    4 ++--
 heat/tests/functional/test_WordPress_With_LB.py |    5 +++--
 heat/tests/functional/util.py                   |    4 ++--
 heat/tests/test_engine_manager.py               |    2 +-
 heat/tests/test_instance.py                     |    2 +-
 11 files changed, 20 insertions(+), 13 deletions(-)

commit 640c0a3e5f5ccca02d152d101e150d87b51e14eb
Merge: 7044fc5 d24e8c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 12 22:41:25 2012 +0000

    Merge "Add 2 instance with EBS test."

commit 7044fc5edc2ecc448775891628706ca41405fe0a
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 12 16:25:25 2012 -0400

    Change Stack to support user defined parameter
    
    This change allows tests to specify DBUsername/DBPassword if necessary.
    The keyname is still looked up in nova and the distribution is retrieved
    from the already existing Stack parameter.
    
    Change-Id: I3732ffb685d68c8a72a83247f74ed11a50a74cd1
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 .../test_WordPress_Composed_Instances.py           |    8 ++++++-
 .../functional/test_WordPress_Single_Instance.py   |    8 ++++++-
 .../test_WordPress_Single_Instance_Boto.py         |    8 ++++++-
 .../test_WordPress_Single_Instance_With_EBS.py     |    8 ++++++-
 .../test_WordPress_Single_Instance_With_EBS_EIP.py |    8 ++++++-
 .../test_WordPress_Single_Instance_With_EIP.py     |    8 ++++++-
 .../test_WordPress_Single_Instance_With_HA.py      |    8 ++++++-
 heat/tests/functional/test_WordPress_With_LB.py    |    8 ++++++-
 heat/tests/functional/test_WordPress_With_RDS.py   |    3 +++
 heat/tests/functional/util.py                      |   22 +++++++-------------
 10 files changed, 67 insertions(+), 22 deletions(-)

commit fe95bd633a6b6d341052cd58814372551c75dc89
Merge: f2817a7 8da4ddf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 12 20:47:20 2012 +0000

    Merge "Make S3 import except on ImportError rather then all exceptions"

commit d24e8c746359169058e9c0577c2f843695ca3b55
Author: Ian Main <imain@redhat.com>
Date:   Wed Sep 12 12:12:31 2012 -0700

    Add 2 instance with EBS test.
    
    Seems to work even.
    
    Change-Id: Ie09d97dc86a68525783f1f9c080fed13e651ef78
    Signed-off-by: Ian Main <imain@redhat.com>

 .../test_WordPress_2_Instances_With_EBS.py         |   66 ++++++++++++++++++++
 1 file changed, 66 insertions(+)

commit f2817a79d3fa6e08fcf0c98314e2ea8df6b72f8f
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 12 11:36:43 2012 -0400

    Change VerifyClass to have a generic verify_url method
    
    Change-Id: I0e1298e7852e336d6271c4014b11935ac3ce6689
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/tests/functional/verify.py |   27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

commit 14fe52e0e632e45657bcf1cef1dca397cc9a9e4e
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Sep 12 09:34:21 2012 -0700

    Update WordPress_Compsed_Instances to new test infrastructure
    
    Change-Id: I08a175d28b99b861ce29b2278e415896e79cf72a
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../test_WordPress_Composed_Instances.py           |   34 +++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

commit 8da4ddf51fedefdb1601baf7359e128f22f396e2
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Sep 12 08:11:30 2012 -0700

    Make S3 import except on ImportError rather then all exceptions
    
    Change-Id: Icb98aed65ccba825f8402fdde95ac38b2a12c1a6
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |    2 +-
 heat/engine/s3.py        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 1ba219d38df61ab4b0807c5fa730287ec903ccca
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Sep 11 13:49:09 2012 -0700

    Make S3 optional since swiftclient is not available in all distributions
    
    Change-Id: Ic5f61ac41090fd599f01b3eaae4ffb03aac2ebdd
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |   11 ++++++++++-
 heat/engine/s3.py        |   15 ++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

commit e49050a87db1452907782b3d515d157c4c75248d
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 19:23:27 2012 +0100

    heat : test utils, extract ec2 credentials from keystone
    
    For StackBoto extract the ec2 credentials from keystone and
    pass them into the client, so the functional tests don't rely
    on ec2 credentials from config-files and only need the currently
    provided keystone credentials
    
    Change-Id: Ifc959011cc5b9ee77ebf04e380dc6a4059903c6d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |   29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

commit ff352a0d10dbac6864bff65cb98b100107fb5060
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 19:07:00 2012 +0100

    heat : allow boto_client to accept credentials
    
    Allow ec2 credentials to optionally be passed in to boto
    rather than purely relying on config-files
    
    Change-Id: Ib821f2bca9bc3f61af521955a9ed52f0059e70e4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/boto_client.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 89bedcb4d2b7b67b55ccc551a1cb53a00d172e7e
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 19:05:36 2012 +0100

    heat : move boto.cfg to correct location
    
    boto.cfg needs to be under /etc not /etc/heat
    or boto won't find it
    
    Change-Id: I0981bb3bd46dd1630633576fc77d085410bf6362
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 etc/boto.cfg      |   23 +++++++++++++++++++++++
 etc/heat/boto.cfg |   23 -----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

commit 455bb8889f66513c55aa60e189be3e7965a49fa9
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 19:03:41 2012 +0100

    heat : comment credentials in template boto.cfg
    
    Comment out the credentials section in /etc/boto.cfg
    this allows us to pass the correct host/endpoint without
    having world-readable credentials.  This can then be used
    as a template for per-user ~/.boto files if desired
    
    Change-Id: I4cea0cb3b790186ddc041edad0ab4ee4b7e8f956
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 etc/heat/boto.cfg |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 33bfcd36d5c0e430eacc51c2693ee56d0c8dad36
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 13:08:22 2012 +0100

    heat tests : add new Boto wordpress functional test
    
    Add new test_WordPress_Single_Instance_Boto.py, which
    does a wordpress single instance test using StackBoto
    
    Note, this will require a valid /etc/boto.cfg to work,
    and probably a recent (git) version of boto
    
    Fixes #220
    
    Change-Id: Ia95de35dc9d1d52ba6b9f4fae333e4fad02762ca
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../test_WordPress_Single_Instance_Boto.py         |   47 ++++++++++++++++++++
 1 file changed, 47 insertions(+)

commit 4c672508dd893d6d1094c4347201afbfe9765cae
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 11 13:06:09 2012 +0100

    heat tests : functional test utils add StackBoto class
    
    Add StackBoto, subclass of Stack, which implements stack
    setup using the boto client wrapper, allows us to test
    AWS auth and boto client libraries
    
    Ref #220
    
    Change-Id: Id5cb5ab72c7ba2e7accd76a73a94ff8fe45c62fa
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |  102 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)

commit a5510ea245b9f291a2a4a496c06aeb3c71322c9c
Author: Steve Baker <steve@stevebaker.org>
Date:   Tue Sep 11 14:58:34 2012 +1200

    Implement the AWS::S3::Bucket resource type.
    
    An attempt was made to make created bucket names readable and unique.
    Names are of the format heat-<resource name>-<random hex>. eg:
    heat-S3Bucket-b420d12d02e5d6e46f13
    
    Only the swift v2 auth is currently supported, which means swift will need to
    use keystone for auth. This may be a valid assumption for any environment that
    is running Heat.
    
    When DeletionPolicy is Delete then an attempt is made to delete the container,
    but the stack will still be deleted if container delete fails.
    
    Run the template S3_Single_Instance.template to give it a try.
    
    Functional tests will be coming in a later change.
    
    Change-Id: Ifa2c3c4fcbdb00a44f8c6b347a61f8e1735e8328

 heat/engine/resource_types.py         |    2 +
 heat/engine/resources.py              |   13 ++++
 heat/engine/s3.py                     |  108 +++++++++++++++++++++++++++++++++
 templates/S3_Single_Instance.template |   30 +++++++++
 tools/pip-requires                    |    1 +
 5 files changed, 154 insertions(+)

commit 1ef28a37068323a531da445815271f2b2e73ef65
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 10 22:13:07 2012 +0200

    Update documentation on configuring metadata server
    
    The docs need to reflect the fact that the metadata server cannot be
    configured and launched until after Nova has created the virtual bridge
    interface.
    
    See issue #196
    
    Change-Id: Ia1a004106fa2b535b54c7b88e8ed177e47e72844
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

commit 2e0dfbab47470e91fdbdbcfc81387692a5523fa3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Sep 10 18:04:34 2012 +0200

    Handle verification errors in create/update in cfn API
    
    If a StackCreate or StackUpdate call fails verification in the engine, we
    get an error message returned rather than a stack identifier.
    
    Fixes #224
    
    Change-Id: I5f47f5d0e25e8bc05633d29605adcc8827edd379
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/v1/stacks.py         |   12 +++++++++---
 heat/tests/test_api_cfn_v1.py |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

commit a080c9465833049c691fb3d50d7cf4e591dbf4a5
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 10 10:52:13 2012 +0100

    heat tools : nova_create_flavors.sh additional retry logic
    
    Add retry logic in order to make creating flavors more
    robust.  Nova rate-limiting frequently causes actions to fail
    so wrap all requests in retry/sleep logic and check we can
    connect to nova before attempting to change anything
    
    Ref #225
    
    Change-Id: I1b1014df04602935f561c08ba29287061224b5f3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/nova_create_flavors.sh |   90 ++++++++++++++++++++++++++++++------------
 1 file changed, 64 insertions(+), 26 deletions(-)

commit 15a88d03e5b187b31d17a00f1b845e5a8a749502
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 10 11:03:37 2012 +0100

    heat tools : add ephemeral disk for all flavors
    
    Add ephemeral disk for all flavors in nova_create_flavors.sh
    as it's currently not possible for EBS to work without a fixed
    mapping to a specific block device name, meaning the EBS templates
    will break for micro/tiny if there if no ephemeral disk defined
    
    Change-Id: I801f00aba5b431d30362cd4b34da2f66457220c5
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/nova_create_flavors.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 0ca10d3e6a41d01435595defa33a7582f57dce68
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 10 10:49:45 2012 +0100

    heat tools : check services running after openstack install
    
    Check all expected services are running after starting them when
    doing tools/openstack install, should avoid possible racy behavior
    when we assume everything is up and immediately call nova_create_flavors.sh
    
    Ref #225
    
    Change-Id: I87ec0ca31579173cb9218fa79e027fd5b15031f0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/openstack |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

commit c292ddb164bceab5883aa585a6a2357c0e33b7aa
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Sep 7 13:22:42 2012 -0700

    Rework functional test case infrasatructure
    
    To support multi-instance, two new classes were made:
    Stack - represents a stack
    Instance - represents an instance
    
    For multi-instance stacks, create multiple Instance objects
    for each instance in the stack.
    
    For each instance in a stack, an instance object can be created which
    helps validate the individual instance sets up properly.
    
    test_WordPress_Single_Instance_With_EBS.py fails - see issue #226
    
    Change-Id: Iddec87cd1332a9b5796c5c7e7d382ef723c3544e
    Signed-off-by: Steven Dake <sdake@redhat.com>
    Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>
    Signed-off-by: Ian Main <imain@redhat.com>

 .../functional/test_WordPress_Single_Instance.py   |   27 +-
 .../test_WordPress_Single_Instance_With_EBS.py     |   31 +-
 .../test_WordPress_Single_Instance_With_EBS_EIP.py |   52 ++-
 .../test_WordPress_Single_Instance_With_EIP.py     |   44 +-
 .../test_WordPress_Single_Instance_With_HA.py      |   30 +-
 heat/tests/functional/test_WordPress_With_LB.py    |   36 +-
 heat/tests/functional/util.py                      |  422 +++++++++++---------
 7 files changed, 334 insertions(+), 308 deletions(-)

commit 489ed4cab4410a2cc727a904bc53dfdd3b19e270
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 7 14:55:54 2012 +0200

    Add a string representation for identifiers
    
    This makes debugging in unit tests a lot easier.
    
    Change-Id: I320cdf754e405377abfeb61496b017809d25d719
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/identifier.py |    3 +++
 1 file changed, 3 insertions(+)

commit 48bac6ac6f4d6c5a90f2662c0f29427ffebccda7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 7 14:57:13 2012 +0200

    Add unit tests for EngineManager create/update/delete_stack
    
    Change-Id: I25aeb43ea3f5a9426b8f742a605b9699dc2b9851
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_engine_manager.py |  203 +++++++++++++++++++++++++++++++++++++
 1 file changed, 203 insertions(+)

commit 4793a68e3abb6f2e02ec8037d573f93c287ca985
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 7 14:54:55 2012 +0200

    Fix update_stack call in EngineManager
    
    This was broken by 38f886947c91ebf610ab2972649a06bec630746b
    
    Change-Id: I134bee2df35d6b025f0ac88334ab30a9a22c7922
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py |    1 +
 1 file changed, 1 insertion(+)

commit 55eb1746aa3fcf3c7ca85cb67d8ee09585773be9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Sep 7 15:09:54 2012 +0200

    Reorganise etc directory for easier installation
    
    This also means that the install script will install bash-completion for
    heat.
    
    Change-Id: Ib60346c72ce6277951cb51952e359f97be20a1be
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 etc/boto.cfg                           |   19 -------
 etc/heat-api-cfn-paste.ini             |   88 --------------------------------
 etc/heat-api-cfn.conf                  |   27 ----------
 etc/heat-api-cloudwatch-paste.ini      |   88 --------------------------------
 etc/heat-api-cloudwatch.conf           |   27 ----------
 etc/heat-engine.conf                   |   33 ------------
 etc/heat-metadata-paste.ini            |   15 ------
 etc/heat-metadata.conf                 |   27 ----------
 etc/heat/boto.cfg                      |   19 +++++++
 etc/heat/heat-api-cfn-paste.ini        |   88 ++++++++++++++++++++++++++++++++
 etc/heat/heat-api-cfn.conf             |   27 ++++++++++
 etc/heat/heat-api-cloudwatch-paste.ini |   88 ++++++++++++++++++++++++++++++++
 etc/heat/heat-api-cloudwatch.conf      |   27 ++++++++++
 etc/heat/heat-engine.conf              |   33 ++++++++++++
 etc/heat/heat-metadata-paste.ini       |   15 ++++++
 etc/heat/heat-metadata.conf            |   27 ++++++++++
 install.sh                             |   72 +++++++++++++++-----------
 17 files changed, 367 insertions(+), 353 deletions(-)

commit a44519774a18cc86a6ede537c14bb7214b1aadc6
Merge: be128a8 e88e9e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 7 03:58:50 2012 +0000

    Merge "Switch to keystone service_type=orchestration."

commit be128a81c61d6df9b60682cfa9ee48ba69f0ebc7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Sep 7 13:12:27 2012 +1000

    Delete unused heat-engine-paste.ini
    
    Change-Id: I4c8d5b2d98634aa4d711d3fe8816891476645548
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 etc/heat-engine-paste.ini |   36 ------------------------------------
 1 file changed, 36 deletions(-)

commit ae0b853499296763dae77aa5c1e4c22225674489
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Sep 7 10:12:29 2012 +1000

    Make sure the properties are defined in all cases.
    
    fixes #194
    
    Change-Id: I994283734d551f81143e7f5de50da0180a277119
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py |    3 +++
 1 file changed, 3 insertions(+)

commit 408ba2172deee7d775d37f22e9f7f377682940fa
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 6 15:04:03 2012 -0700

    Add test case for WordPress_With_LB.template
    
    Change-Id: I324da126b5a775a00b97d868cbd347dd65cb16aa
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/tests/functional/test_WordPress_With_LB.py |   54 +++++++++++++++++++++++
 1 file changed, 54 insertions(+)

commit 245a13f8f3d514c4e4ed59fce0d1920727a230bb
Merge: 3b27b1d 2f9a131
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 21:50:36 2012 +0000

    Merge "Rename heat-api to heat-api-cfn"

commit 3b27b1d6b1c4739b8d456703542ec8182ce12277
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Sep 6 13:27:50 2012 -0700

    Add a Wordpress+MySQL composed instance functional test case
    
    Change-Id: I6a905b186be59c929e530519414e46d222b4ea08
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../test_WordPress_Composed_Instances.py           |   54 ++++++++++++++++++++
 1 file changed, 54 insertions(+)

commit 882ef5228eb0835ee6e3a434e6ff6896afb05e2a
Merge: 248663b 78b7127
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 18:24:39 2012 +0000

    Merge "Add EBS test."

commit 78b712741942713692c64a306c0b10ca7fae3206
Author: Ian Main <imain@redhat.com>
Date:   Thu Sep 6 11:10:48 2012 -0700

    Add EBS test.
    
    Single wordpress EBS functional test.
    
    Change-Id: I3a3e53b418a38a2bb8573d7abb16c9c7fe8837ca
    Signed-off-by: Ian Main <imain@redhat.com>

 .../test_WordPress_Single_Instance_With_EBS.py     |   66 ++++++++++++++++++++
 1 file changed, 66 insertions(+)

commit 248663b0670ad75ff738ad2dc816650cf7e182cc
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 6 17:51:10 2012 +0100

    heat tests : new wordpress EBS_EIP functional test
    
    Add new functional test for the
    WordPress_Single_Instance_With_EBS_EIP template
    
    Fixes #209
    
    Change-Id: I800cbe21ef42611f93644e6a0c60b732af663025
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../test_WordPress_Single_Instance_With_EBS_EIP.py |   90 ++++++++++++++++++++
 1 file changed, 90 insertions(+)

commit b98f402fa7ca977769de09a6cc200ee9f928bc6c
Author: Ian Main <imain@redhat.com>
Date:   Thu Sep 6 09:40:42 2012 -0700

    Forgot commas, doh!
    
    I had this in and tested but forgot to put commas in after update.
    
    Change-Id: I7fbcacea0a4ab40f1e6b6e016fd5940ba8432c26
    Signed-off-by: Ian Main <imain@redhat.com>

 .../WordPress_Single_Instance_With_EBS.template    |    4 ++--
 ...WordPress_Single_Instance_With_EBS_EIP.template |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit c805d065a1f99b280093c1a37cb91c1c6815e280
Author: Ian Main <imain@redhat.com>
Date:   Thu Sep 6 08:27:45 2012 -0700

    More EBS fixes.
    
    Single instance with EBS apparently needs an httpd restart in order to
    keep talking to mysql after we change the partition.  Also change other
    EBS templates to use vdc.
    
    Change-Id: I180cca2166a0210d5d8dd3e0aea111ea625b865a
    Signed-off-by: Ian Main <imain@redhat.com>

 templates/WordPress_2_Instances_With_EBS.template  |   12 ++++++------
 .../WordPress_2_Instances_With_EBS_EIP.template    |   12 ++++++------
 .../WordPress_Single_Instance_With_EBS.template    |    1 +
 ...WordPress_Single_Instance_With_EBS_EIP.template |    1 +
 4 files changed, 14 insertions(+), 12 deletions(-)

commit 2f9a1310e3d7e1f14ed1987b1371a2d693833481
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Aug 30 13:32:47 2012 +0200

    Rename heat-api to heat-api-cfn
    
    The previous heat-api is, in fact, a CloudFormation-compatible API. Rename
    it to heat-api-cfn, analogous to how the EC2 API in Nova is named
    nova-api-ec2.
    
    Change-Id: I9759f10cee6a60cdc9cb917966eb9fb95a618f85
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-api                  |   59 ---
 bin/heat-api-cfn              |   59 +++
 docs/GettingStarted.rst       |    2 +-
 docs/man/man1/heat-api-cfn.1  |   43 ++
 docs/man/man1/heat-api.1      |   43 --
 etc/heat-api-cfn-paste.ini    |   88 ++++
 etc/heat-api-cfn.conf         |   27 +
 etc/heat-api-paste.ini        |   88 ----
 etc/heat-api.conf             |   27 -
 etc/heat-engine.conf          |    2 +-
 heat/tests/test_api_cfn_v1.py | 1087 +++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_api_v1.py     | 1087 -----------------------------------------
 install.sh                    |   12 +
 run_tests.sh                  |    2 +-
 setup.py                      |    2 +-
 tools/uninstall-heat          |    3 +-
 16 files changed, 1322 insertions(+), 1309 deletions(-)

commit 0706efc6028d06307945f1853c5ff45c57acc384
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 6 14:32:14 2012 +0100

    heat templates : EBS templates, attach volume to vdc
    
    Fix Single_Instance_With_EBS templates, need the EBS
    disk to attach to vdc not vdb which is used for the
    ephemeral disk (fix from imain)
    
    Fixes #185
    
    Change-Id: I47d1b640d25c0f53dd4535e4bd73846d01f4fc86
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../WordPress_Single_Instance_With_EBS.template    |   12 ++++++------
 ...WordPress_Single_Instance_With_EBS_EIP.template |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

commit 809ad01ec7a9e0084e84f541090eb4449186509a
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 6 11:41:15 2012 +0100

    heat tests : bugfix FuncUtils check StackId not StackName
    
    CreateStack response no longer contains StackName, so
    we need to parse the StackId and extract the name from
    the new ARN format
    
    Change-Id: If55ff286c98e8396a14fa4ee2b08622faa680a03
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 4c26639378381028af5c096885051997f34c7fed
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Sep 6 11:01:10 2012 +0100

    heat templates : Add default LinuxDistribution parameter
    
    Add default value to LinuxDistribution template parameter
    for MySQL_Single_Instance.template
    
    Change-Id: I6431b717dee700f9db588ddbaf58511d0a3b107c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 templates/MySQL_Single_Instance.template |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 24db4e2086b5965b14d4a197198174d45d742ed5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Sep 6 12:37:24 2012 +0200

    Fix identify_stack call
    
    It needs to return a dictionary in order for the result to be converted to
    JSON.
    
    Change-Id: Ieef360fd6872624325470fab626d371ed28535e6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 18bc3baf15849ed9482020720ab0906f13b46069
Merge: 585afae b1696fb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 04:13:49 2012 +0000

    Merge "Add a newline to user data injection."

commit 585afae452922efe4f2238615add9d76719fb7f0
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Sep 5 22:47:18 2012 -0400

    Modify to use systemctl and move func_utils outside of setUp
    
    Change-Id: I420991fa4e881f6f9fadd0add02a9d1493240dfc
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 .../test_WordPress_Single_Instance_With_HA.py      |   23 ++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)

commit b1696fb1b0be8e6e2ce154d748ed25289a216125
Author: Ian Main <imain@redhat.com>
Date:   Wed Sep 5 19:00:54 2012 -0700

    Add a newline to user data injection.
    
    If no newline is present at the end of the user-data section of the
    template, the addition of the touch command will cause the last
    line to break.
    
    Change-Id: I15ba402f83f6fba03f7d0455a63a5dc03480973d
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/instance.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5655589895def95709d345509db95a2cc5e1ff7b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Aug 30 11:41:25 2012 +1000

    Fix pep8 warning
    
    Change-Id: Ia0b4336e7e861fefc7afebc99a3c6ddf48841d71
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 38f886947c91ebf610ab2972649a06bec630746b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 5 21:51:25 2012 +0200

    Support lookup of stacks by name or ARN
    
    Previously stacks could only be referenced by name. Now, use the canonical
    stack identifier to act on them. The identifier can be obtained from the
    RPC API by looking it up with identify_stack. In the AWS API, the user
    can pass an ARN that is converted into an identifier.
    
    Change-Id: I29309d12e522ed301c3f6269df5d1d14382b024b
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/v1/stacks.py             |   58 +++++--
 heat/engine/manager.py            |   71 ++++----
 heat/engine/rpcapi.py             |   39 +++--
 heat/tests/test_api_v1.py         |  329 +++++++++++++++++++++++++++++++++----
 heat/tests/test_engine_manager.py |   31 ++--
 5 files changed, 417 insertions(+), 111 deletions(-)

commit 052a6a431144f8d249c562e8a633e3e0afea12d5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 5 21:51:25 2012 +0200

    Add an identify_stack RPC call
    
    This call converts a stack name into a fully-qualified stack identifier.
    
    This allows us to, e.g., add support for keeping deleted stacks around in
    the database while still allowing stack names to be reused, since the
    deleted stacks can be referenced using this ID.
    
    Change-Id: Ide19841a92a25d2f6172f19c2627d24ab6d2fd63
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py            |   16 ++++++++++++++++
 heat/engine/rpcapi.py             |   15 +++++++++++++++
 heat/tests/test_engine_manager.py |    9 +++++++++
 3 files changed, 40 insertions(+)

commit e8b464dabfd95c8ce7c90c72cb5132e7140062f7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 5 21:51:25 2012 +0200

    Report StackId in ARN format
    
    In the RPC API, return a full stack identifier instead of just the database
    ID of a stack. In the AWS API, convert this to an ARN for the user.
    
    Change-Id: I5c3ede4885c4ac5801cfef49e05695f3d13622da
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/v1/stacks.py             |   22 +++----
 heat/engine/api.py                |   14 ++---
 heat/engine/manager.py            |    6 +-
 heat/tests/test_api_v1.py         |  116 +++++++++++++++++++------------------
 heat/tests/test_engine_manager.py |   16 ++---
 5 files changed, 90 insertions(+), 84 deletions(-)

commit 4465694e0d0e20ccc6383a8cd406f2df38de00ae
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 5 21:51:25 2012 +0200

    Create a unique identifier for stacks
    
    Change-Id: I1517502a2a5d9a96803565297315e7b276f2e974
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/identifier.py     |  115 +++++++++++++++++++++
 heat/engine/parser.py         |    8 ++
 heat/tests/test_identifier.py |  228 +++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_parser.py     |   10 ++
 4 files changed, 361 insertions(+)

commit 8e1d4ef2100c0960d634f5bd848d62fab132a4bc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Sep 5 21:51:25 2012 +0200

    Use assertEqual() instead of assert_()
    
    assertEqual(x, y) reports helpful error messages, unlike assert_(x == y)
    which reports only that False is not True.
    
    Change-Id: Idbea59dc4dbbe4ac00bad6f358896fbc9401acab
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/examples/test3.py |    2 +-
 heat/tests/test_api_aws.py   |    2 +-
 heat/tests/test_api_v1.py    |   58 ++++++++++++++++++++++++------------------
 3 files changed, 35 insertions(+), 27 deletions(-)

commit 9fecadca6c96fa33e697df833e2f170f956b1409
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 5 16:26:27 2012 +0100

    heat tests : add functional test for Wordpress RDS
    
    Add functional test for WordPress_With_RDS template
    
    Fixes: #215
    
    Change-Id: I0613c40e218acaab987a2b0e0df7737cb6f6b6b3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/test_WordPress_With_RDS.py |   66 ++++++++++++++++++++++
 1 file changed, 66 insertions(+)

commit ab6817ea3601ab211696bcf8635596a58e4585c0
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 5 15:13:59 2012 +0100

    heat tests : convert functional test to class
    
    Covert test_WordPress_Single_Instance_With_EIP to be nose
    unittest.TestCase subclass, so run_tests.sh outputs a more
    informative test identifier
    
    Change-Id: I21968b4ae9e0e8f7bc1ef9d3f6db0433f106826a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../test_WordPress_Single_Instance_With_EIP.py     |   76 ++++++++++----------
 1 file changed, 39 insertions(+), 37 deletions(-)

commit 4a0314522f63c96ad0b64df818a347da9b9dda7f
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 5 14:39:44 2012 +0100

    heat tests : update WordPress_Single_Instance_With_EIP
    
    Update functional test WordPress_Single_Instance_With_EIP
    to use the new verify_wordpress which checks that the wordpress
    homepage specified in the stack output looks OK
    
    Change-Id: I6b839e95f2c9fc8d89a22c062c393d6f14fb5df9
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../test_WordPress_Single_Instance_With_EIP.py     |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 98485bdcf4a32c32b4b50b13155eb50e25baf934
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 5 14:20:19 2012 +0100

    heat tests : convert functional test to testcase class
    
    Covert test_WordPress_Single_Instance to be nose unittest.TestCase
    subclass, so run_tests.sh outputs a more informative test identifier
    
    Change-Id: I19fe8565d99253cabcbc93d2f003c69d953be615
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../functional/test_WordPress_Single_Instance.py   |   27 ++++++++++----------
 1 file changed, 14 insertions(+), 13 deletions(-)

commit d20543e306136393f4807ebdebc76e921e630329
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Sep 5 10:47:46 2012 +0100

    heat tests : FuncUtils use heat_client in create_stack
    
    Use heat_client (not subprocess) to create the stack,
    as this will allow easier testing of the boto_client
    library and easier checking of create_stack result
    
    Change-Id: Ic3f710ec2e467bcd2fde1a2451709d444b89aca0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |   32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

commit e0db51bbd29b36944362cf325daab234e24ee2af
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 4 19:03:24 2012 +0100

    heat tests : FuncUtils cleanup use heat_client
    
    Use heat_client calls (not subprocess) in cleanup
    
    Change-Id: Ie622d22af66ce00272df975823a74a8fa7bd25c8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 750720e5a0da5a998a8cb30fa62eeb2a81d7fe1b
Merge: fd38656 fc25353
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 5 12:33:29 2012 +0000

    Merge "Add functional test for HA template"

commit e88e9e526729f153884b6d8a5ac7ac9d8bae709d
Author: Steve Baker <steve@stevebaker.org>
Date:   Wed Sep 5 08:16:55 2012 +1200

    Switch to keystone service_type=orchestration.
    
    This is to match the service type configured in devstack heat.

 heat/common/auth.py                  |    2 +-
 heat/engine/auth.py                  |    2 +-
 tools/heat-keystone-service          |    2 +-
 tools/heat-keystone-service-devstack |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit fd38656097f56b51d25e4e3641936d6b3f7331dd
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 4 17:25:29 2012 +0100

    heat tests : test_WordPress_Single_Instance.py update
    
    Update test_WordPress_Single_Instance.py to use the new
    verify_wordpress which checks that the wordpress homepage
    specified in the stack output looks OK
    
    Change-Id: I9c2c35215ac97f98e62bf1787db3d8645b50c762
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../functional/test_WordPress_Single_Instance.py   |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 94493237040f957ad2bd4186886d46309c2de88d
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 4 17:18:37 2012 +0100

    heat tests : Add verify_wordpress helper function
    
    Functional tests : Add a new VerifyStack class and retry decorator,
    which allows easy implementation of tests for stack successful creation.
    
    Initial simple verify_wordpress function scrapes a wordpress homepage
    and looks for a known string in the html result.
    
    Change-Id: I32bd4bea04228c4f393894c65d040d55c65ddbca
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/verify.py |   77 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

commit 44bb725f41c6690dc13e3a350a5675469f24750a
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Sep 4 17:08:34 2012 +0100

    heat tests : FuncUtils add get_stack_output function
    
    Add a function to FuncUtils which allows us to easily parse
    the stack outputs defined in a template
    
    Change-Id: Ie1891cb11f54d019315350d449bdc5e22e340458
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/functional/util.py |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 31a76f2ee7d3b3868179abc6e763f15de0fa5b73
Merge: 1c485f9 f43507a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 16:02:21 2012 +0000

    Merge "heat tools : add qpid-cpp-server-daemon to tools/openstack"

commit 1c485f9ae130fc37e993deafb0ad8fe1935d1cba
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Sep 3 16:59:57 2012 +0200

    Fix support for eventlet 0.9.16
    
    The changes in c7059ae54ef2712e7599a6de30a631d3a0bb6bd2 were not enough
    to provide compatibility with 0.9.16 and 0.9.17.ith 0.9.16 and 0.9.17.
    
    Change-Id: Id1ddc988443e162f1c835505b619b7b45e86578d
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/common/wsgi.py |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

commit f43507a1a00b53a3372031db224598e7cb3f19a9
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Sep 3 14:04:31 2012 +0100

    heat tools : add qpid-cpp-server-daemon to tools/openstack
    
    As of qpid-cpp-server-0.16-5 the service scripts have been
    moved to a separate qpid-cpp-server-daemon package, so add
    this to the list of required packages for openstack install
    
    Fixes : #219
    
    Change-Id: I6c8b53a69953c543df7cd68637e4ff5e4ca495ad
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/openstack |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fc253535f2ef3cc256b8dd6912b65ac136eafb9c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Aug 28 13:16:32 2012 +1000

    Add functional test for HA template
    
    Change-Id: I6d3304b807492e7041264402d161365447fa6ce1
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../test_WordPress_Single_Instance_With_HA.py      |   70 ++++++++++++++++++++
 1 file changed, 70 insertions(+)

commit 1ce586c96cbacc4bd60ea5dab7ed62b0cca7d3e3
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 31 13:49:40 2012 +0100

    heat : run_tests.sh allow easier test selection
    
    Allow each category of test (unit/funtional/pep) to be
    more easily selected via CLI options, default with no args
    remains unit+pep8
    
    Change-Id: I85bbe0afe6170559a42f8c1619db24df16c6d9b0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 run_tests.sh |   54 ++++++++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

commit 51dc63bb07dd63ab900759f9bf2217b56023a598
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 22 10:30:46 2012 +0100

    heat cli : initial heat-watch cloudwatch API client
    
    Implements new client to demonstrate new Cloudwatch API
    
    Currently only provides options for DescribeAlarms,
    ListMetrics, PutMetricData and SetAlarmState
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I3963a07694cec9af96d9d7369cc7d18d629fcd2d

 bin/heat-watch                 |  281 ++++++++++++++++++++++++++++++++++++++++
 etc/boto.cfg                   |    3 +
 heat/boto_client.py            |    7 +-
 heat/boto_client_cloudwatch.py |  210 ++++++++++++++++++++++++++++++
 setup.py                       |    1 +
 5 files changed, 500 insertions(+), 2 deletions(-)

commit 311092a29468e085b89ed6f07a9e593bbe6b0f37
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 22 10:30:03 2012 +0100

    heat API : Implement initial CloudWatch API
    
    Initial AWS-compatible CloudWatch API implementation
    Supports the following API actions:
    - DescribeAlarms : describe alarm/watch details
    - ListMetrics : List watch metric datapoints
    - PutMetricData : Create metric datapoint
    - SetAlarmState : temporarily set alarm state
    
    Skeleton implementation of all other TODO actions which
    returns HeatAPINotImplementedError.
    
    Only basic filtering parameters supported at this time.
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    Change-Id: I8628854a135fff07b675e85150ea0b50184ed2e1

 bin/heat-api-cloudwatch           |   59 +++++
 etc/heat-api-cloudwatch-paste.ini |   88 +++++++
 etc/heat-api-cloudwatch.conf      |   27 ++
 heat/api/cloudwatch/__init__.py   |   81 ++++++
 heat/api/cloudwatch/watch.py      |  334 +++++++++++++++++++++++++
 heat/tests/test_api_cloudwatch.py |  487 +++++++++++++++++++++++++++++++++++++
 setup.py                          |    1 +
 7 files changed, 1077 insertions(+)

commit 7a382d5ff1390aae91f5d4df633e4cf7e2e39006
Merge: efe6b81 d656978
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:25:47 2012 +0000

    Merge "Add new functional test for WordPress_Single_Instance_With_EIP"

commit efe6b8149658019dcb29e6ae7c330c94488bc39f
Merge: a84c2ce d7bd513
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:24:36 2012 +0000

    Merge "Connect to heat client, add accessor method, and fix ip check"

commit a84c2cefc3e5a3f937c4cb40066a3dc489dbe4bf
Merge: ab39d2a 18120be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:23:30 2012 +0000

    Merge "Add new methods to get access to nova/glance clients"

commit ab39d2a0dd0b3668048aad7bb491d08577df56df
Merge: 4772e69 384a865
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 15:22:08 2012 +0000

    Merge "Make sure the functional test always cleans up"

commit 4772e69b3895a737521eadb741f774680d7a7b27
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Aug 30 13:56:47 2012 +0100

    heat engine : Add set_watch_state engine RPC action
    
    Add set_watch_state which allows a watch/alarm state
    to be temporarily overridden, simplified asynchronous
    version following review/discussion
    
    Change-Id: I9f1424007fc16d1cec2f7dc504600455fe5ab3bb
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/manager.py            |   87 +++++++++++++++++++++++++++----------
 heat/engine/rpcapi.py             |   11 +++++
 heat/engine/watchrule.py          |    9 ++--
 heat/tests/test_engine_manager.py |   61 ++++++++++++++++++++++++++
 heat/tests/test_rpcapi.py         |    4 ++
 5 files changed, 147 insertions(+), 25 deletions(-)

commit bea7e3faadc8123f1993f69ce979a96ec17f3d66
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 29 15:11:06 2012 +0100

    heat engine : Expose valid watch states via engine.api
    
    Expose valid watch states via engine.api
    
    Change-Id: I26a1d8939ce75a0be88e646858f3f3b4feb5e8d0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/api.py |    7 +++++++
 1 file changed, 7 insertions(+)

commit d656978e96489d7ce6cd0d91f90807ff2dc1f1ef
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Aug 31 01:57:37 2012 -0400

    Add new functional test for WordPress_Single_Instance_With_EIP
    
    Change-Id: I483c5c32b9c29dc966bd154d760108292fcdbf5f
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 .../test_WordPress_Single_Instance_With_EIP.py     |   61 ++++++++++++++++++++
 1 file changed, 61 insertions(+)

commit d7bd513b77d1dee5bd876aa1f27bacb281a4cdab
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Aug 31 01:19:39 2012 -0400

    Connect to heat client, add accessor method, and fix ip check
    
    Search server list for IP based on the PhysicalResourceId, not an arbitrary
    server name. Wait until stack create event before obtaining value.
    
    Change-Id: Ie9e3df5369132dbf668f8b42cd10a7f2faec1922
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/tests/functional/util.py |   44 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

commit 18120bed7f69674676a1cf554abf319f1285864c
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Aug 30 11:38:09 2012 -0400

    Add new methods to get access to nova/glance clients
    
    Change-Id: I5be8d7d57d021635422035742f59acdaeb8b409a
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/tests/functional/util.py |   35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

commit 384a865bcb18dc62a9f719b2c94ea7f4301fbbd1
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Aug 30 15:44:41 2012 +0200

    Make sure the functional test always cleans up
    
    Change-Id: I740f676452905d3aceb3d2df37e4c4cdb6b81d7e
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 .../functional/test_WordPress_Single_Instance.py   |   42 ++++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

commit 119d4a06f3101fed4b562d19729ac4cdbe4341e8
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 28 19:25:28 2012 +0100

    heat API : add get_param_value to API utils
    
    Add get_param_value helper to common aws API utils
    
    Change-Id: I69ab3ed1e34f8691457f3d986b4af06b1d381039
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/aws/utils.py |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 43e558ff5ebdaa2880d416857ab3573b5d0c002b
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Aug 29 13:30:47 2012 -0400

    Add new arguments to run_tests
    
    Execute unit tests and pep8 by default. Allow tests to be chosen in a more
    additive fashion. Cleaned up unnecessary let statements and variable
    defines.
    
    Change-Id: I40676c5d0deda7bd3abc4bdadfd404f5909c166e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 run_tests.sh |   71 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

commit 129f073e660b4fa690b0c81bf9d0d7bc0f930e34
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Aug 29 19:12:48 2012 +0200

    Refactor reformat_dict_keys()
    
    This way is a little more Pythonic.
    
    Change-Id: Ib48d0e9b7e8a4ed6e220c645a29510c893e97419
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/aws/utils.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 87df079624e4b1441e254db2b066f3b7e9b7fb87
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Aug 29 19:35:12 2012 +0200

    Refactor extract_param_pairs()
    
    Implement it in terms of the more general extract_param_list().
    
    Change-Id: Ifbf0dd8205da87e707610c0b8cb0ca616d7b2e22
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/aws/utils.py      |   26 ++++----------------------
 heat/tests/test_api_aws.py |   34 +++++++++++++++-------------------
 2 files changed, 19 insertions(+), 41 deletions(-)

commit d2401dbaf1f1906d9d787dea18df7df3b9c08eec
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Aug 29 16:10:31 2012 +0200

    Refactor extract_param_list()
    
    Change-Id: Ia338c7c4a17af90885b1c83297d32a61d2177ecd
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/aws/utils.py      |   49 +++++++++++++++++++-------------------------
 heat/tests/test_api_aws.py |   10 ++++-----
 2 files changed, 26 insertions(+), 33 deletions(-)

commit 590b70f50a123458ffe684f5fc7642fdf8e47d75
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Aug 28 15:23:44 2012 -0400

    Add link to RPM repository in getting started
    
    Change-Id: I79fcc10b2594b977097d7d91022cbd50adcc9167
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 docs/GettingStarted.rst |    2 ++
 1 file changed, 2 insertions(+)

commit 7ff3bde24c40a94a1485d47d4a2865a5e018f358
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Aug 23 18:21:07 2012 +0100

    heat API : Add api.aws.utils.extract_param_list
    
    Add new common helper function which extracts
    AWS parameter lists
    
    Change-Id: Ic77ff6014a4f39d4fb5d59a1391f87cdd94f0f7f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/aws/utils.py      |   46 ++++++++++++++++++++++
 heat/tests/test_api_aws.py |   91 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+)

commit 24d38e0a6715950f86afd194ab66efd8b5ad47be
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 28 09:35:20 2012 +0100

    heat tests : rename test_stacks
    
    Rename test_stacks.py to test_engine_manager.py
    as this better reflects what is being tested
    
    Change-Id: I612351286fbb008b2be3db7519f0a24ab9d2d8e2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/test_engine_manager.py |  434 +++++++++++++++++++++++++++++++++++++
 heat/tests/test_stacks.py         |  434 -------------------------------------
 2 files changed, 434 insertions(+), 434 deletions(-)

commit f591838a44af5c150be05cf593b16a912be2b244
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 28 09:33:01 2012 +0100

    heat tests : add test for new manager show_watch_metric method
    
    Add unit tests for new manager show_watch_metric action
    
    Change-Id: Ie1b7c0a0e1eb5c7e5fad74674b1a9669bf7c9a1c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/test_stacks.py |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit e81fe17a2c8a95270d45aeb6f63979d02174cc67
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 24 16:33:19 2012 +0100

    heat tests : add tests for new manager show_watch method
    
    Add unit test for new show_watch engine action
    
    Change-Id: I00153f258687e02837b901c399df51085bb34303
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/test_stacks.py |   39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

commit 16ec0a357c64e0056269f4d3e56ffdff724e387f
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 24 16:30:39 2012 +0100

    heat engine : bugfix show_watch, fix single-watch mode
    
    When called with watch_name!=None we need to wrap the
    watch_rule_get response in a list
    
    Change-Id: I83bbe816758767afd3eb49b090b0b652036cad60
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/manager.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 4eb99bc37a6efd41ab36446a697af4e402874127
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Aug 24 13:22:16 2012 +0100

    heat tests : add new engine rpcapi unit tests
    
    Add tests for new watch engine methods
    
    Change-Id: Icbfc900d7578d7d0f8cd9024d8a5b57a9695c0a4
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/test_rpcapi.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit cbf27b1ec8745a1040038516bcadbb095570d934
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Aug 27 16:33:59 2012 -0400

    Add test-requires in RPM package list form
    
    This is to allow automated installation of dependences since functional
    tests are not going to be run with packages from pip.
    
    Change-Id: Ia9f74bc353bab79d7c78cb086210d8628d701387
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 tools/test-requires-rpm |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit 13a79650b9d9c4462a9049ab452dbacac6b33b78
Merge: 7ae4bab 16e8261
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 14:46:51 2012 +0000

    Merge "Functional test improvements"

commit 7ae4bab7150c885738bfeac98f443da5dc93d321
Merge: 411ae60 e30d482
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 09:54:20 2012 +0000

    Merge "Fix the Timeout/Interval check in the LB."

commit 411ae6039102096604238d6aa6286f9e4b4ff22d
Merge: 20345dc c7059ae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 08:35:23 2012 +0000

    Merge "Set the max url length in eventlet 0.9.17"

commit c7059ae54ef2712e7599a6de30a631d3a0bb6bd2
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Aug 22 16:45:27 2012 +0200

    Set the max url length in eventlet 0.9.17
    
    The version with configurable url limit was released and packaged for
    Fedora 17.
    
    The monkey-patch does not work on new eventlet.
    
    ref #55
    fixes #197
    
    Change-Id: I728cc3b0851261667bb9b07220c855bced1344a4
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/common/wsgi.py |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit 16e82611d69702969a39111e4fdaa87440b8519b
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Aug 27 02:18:53 2012 -0400

    Functional test improvements
    
    -Move everything out of init so unit tests are not affected.
    -Make JEOS creation part of utils class, now tests can choose
    which JEOS to use.
    -Only attempt to create JEOS if a suitable one is not found in glance.
    
    Change-Id: I162e7447ae1fed17855bdca8eba16ac7f952db01
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/tests/functional/__init__.py                  |   58 --------------------
 .../functional/test_WordPress_Single_Instance.py   |    1 +
 heat/tests/functional/util.py                      |   51 +++++++++++++++++
 3 files changed, 52 insertions(+), 58 deletions(-)

commit e30d48231dafa3d73c2b6ea29d5ae434f10d7d0d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 27 15:09:06 2012 +1000

    Fix the Timeout/Interval check in the LB.
    
    http://docs.amazonwebservices.com/ElasticLoadBalancing/latest/APIReference/API_HealthCheck.html
    
    Fixes: #198
    
    Change-Id: I3ec3e5a946e32695f3f9b0930b922837ab80ea66
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/loadbalancer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 20345dc8c6338d3a90de4e3e9011c94d2327020e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 27 14:02:26 2012 +1000

    Fix the way self.properties is checked for a value.
    
    The following only checks if the key is in the properties, and
    all schema keys are, so it is not the way to check if a value
    has been set.
    
    if 'DesiredCapacity' in self.properties:
    change to:
    if self.properties:
    
    Fixes: #199
    
    Change-Id: I6bcb3e74420031532dc249aafe85d5a428d0a80e
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/autoscaling.py    |    2 +-
 heat/engine/eip.py            |    5 +----
 heat/engine/security_group.py |    2 +-
 heat/engine/user.py           |    7 +++----
 4 files changed, 6 insertions(+), 10 deletions(-)

commit 5e41a1ee73f146204e80b0863362fa2eb049541a
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Aug 26 18:09:43 2012 -0700

    Make RDS (mysql) wait until setup is finished before proceeding
    
    It is possible a service dependent on RDS may issue commands to
    the RDS service before mysql has finished installing.  Added
    a wait condition to force synchronization.
    
    Change-Id: I6abf2d62e92d19945c587deeb61605df2c97ec85
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/dbinstance.py |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

commit 99bd84e03b83f16a27455e1feaec4d430553e1d7
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Aug 26 17:00:12 2012 -0700

    Put selinux in permissive mode by default via a runcmd in cloudconfig
    
    Change-Id: I7db02a967de9a3e85876901163f7611196a9429f
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/cloudinit/config |    4 ++++
 1 file changed, 4 insertions(+)

commit 89df904c50c483b307a8c6d116c970dab449d710
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Aug 23 16:14:43 2012 +0100

    heat API : make extract_user_params more generic
    
    Make api.aws.utils.extract_user_params into a more
    generic aws-format-list-extraction function
    
    Change-Id: If6811ea1a138ddff96542f983397852dfbd483fd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/aws/utils.py      |   36 ++++++++++++++++++------------------
 heat/api/v1/stacks.py      |   18 +++++++++++++++++-
 heat/tests/test_api_aws.py |   20 +++++++++++++++-----
 3 files changed, 50 insertions(+), 24 deletions(-)

commit 00527198c863dbbc407ba7aa56a5d430655f7000
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 22 14:11:52 2012 +0100

    heat engine : Add show_watch_metric RPC action
    
    Adds show_watch_metric, which allow alarm/watch
    metric data to be retrieved from the engine
    
    Change-Id: Ie69691dbf781016e6262bbbabbe57f9c3396a5d5
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/api.py     |   32 ++++++++++++++++++++++++++++++++
 heat/engine/manager.py |   24 ++++++++++++++++++++++++
 heat/engine/rpcapi.py  |   15 +++++++++++++++
 3 files changed, 71 insertions(+)

commit a7f4e34e5795973f89ddb83b8bdd322f8c734496
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 21 17:33:49 2012 +0100

    heat engine : add show_watch RPC method
    
    Add new show_watch RPC method, to allow retrieval
    of information related to watches for cloudwatch
    
    Change-Id: Ib434c80cf6cfab7f2cba972d5316f0ed2bbcbf30
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/api.py     |   75 ++++++++++++++++++++++++++++++++++++++++++++++++
 heat/engine/manager.py |   23 +++++++++++++++
 heat/engine/rpcapi.py  |   13 +++++++++
 3 files changed, 111 insertions(+)

commit 6b7c5356cbb87e0c5c8a7d35de40b0357f46c813
Merge: bb6e0b1 8ba6c8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 23 23:09:22 2012 +0000

    Merge "Split functional test into standalone and utility class"

commit 8ba6c8ffe869a7f6db0321bbeeea200a0fb140c4
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Aug 21 16:26:41 2012 -0400

    Split functional test into standalone and utility class
    
    This allows functional tests to be written for each individual template.
    See the test_Wordpress_Single_Instance for an example, but the basic
    form to follow is:
    
    import util
    
    def test_template():
        func_utils = util.FuncUtils()
    
        func_utils.create_stack(template, 'F17')
        func_utils.check_cfntools()
        func_utils.wait_for_provisioning()
        func_utils.check_user_data(template)
    
        ssh = func_utils.get_ssh_client()
    
        # test stuff here
    
        func_utils.cleanup()
    
    Functional test changes:
    Changed jeos creation to use new tool.
    Added distribution to heat stack creation.
    Improved IP parsing from glance.
    Improve SSH connection exception handling.
    Changed cfntools SHA check to match installed copy instead of locally.
    Fixed stack parsing to check correct file and handle user-data injection.
    
    Clean up run_tests a little to make it clear default execution is on host.
    Add a short option for unit test running only (may be important due to not
    wanting to run functional tests locally).
    
    Also added paramiko to test-requires.
    
    Change-Id: Ib2ae1be32801cb0ee3d1937c4f82ab9f574b4591
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/tests/functional/__init__.py                  |   71 ++++++
 .../functional/test_WordPress_Single_Instance.py   |   42 +++
 heat/tests/functional/test_bin_heat.py             |  250 ------------------
 heat/tests/functional/util.py                      |  267 ++++++++++++++++++++
 run_tests.sh                                       |   11 +-
 tools/test-requires                                |    1 +
 6 files changed, 385 insertions(+), 257 deletions(-)

commit bb6e0b11c6f4d0f185fdd9011daba526f4aff8fe
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 22 20:14:11 2012 +0100

    heat DB : make watch_data_get_all work with no watch ID
    
    Align watch_data_get_all with other "all" methods, and
    return all watch data without requiring an ID.  We may
    also need by_id and by_name variants but this is more
    consistent and makes things easier for cloudwatch.
    
    Change-Id: I09c90278349efc769ab7c719f686a1fd854b425a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/db/api.py            |    4 ++--
 heat/db/sqlalchemy/api.py |    6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

commit 9b14adc222c01f8a54c56bfe0b6658bd2968bda9
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 22 09:54:08 2012 +0100

    heat API : Add HeatAPINotImplementedError exception
    
    Add heat-specific HeatAPINotImplementedError, which
    allows us to return a sensible error to requests for
    API actions which have not yet been implemented
    
    Change-Id: Ibaee8312e7e563d29801bd325d7638bca9efa622
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/aws/exception.py |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit ecc5a408a33f83b428a77376000c0b6f409393cd
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 21 11:52:24 2012 +0100

    heat API : Move aws api common code into aws/utils.py
    
    Move heat-api AWS common utility functions into a new
    utils.py, so these functions can be reused by cloudwatch
    
    Change-Id: I030d796b1048ffc4e7c40f7c8760121ab2854733
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/aws/utils.py      |   78 ++++++++++++++++++++++++++++++++++
 heat/api/v1/stacks.py      |   98 +++++++++---------------------------------
 heat/tests/test_api_aws.py |  101 ++++++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_api_v1.py  |   58 -------------------------
 4 files changed, 200 insertions(+), 135 deletions(-)

commit 1b6c2dad19a1e0d8d34c9687a61892d12f9cbedb
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 21 11:14:18 2012 +0100

    heat API : move remote_error to common exception.py
    
    Move API exception-mapping function to the common exception.py
    
    Change-Id: If64511be0d77d9c9f9e610bbb0564d57f4530499
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/aws/exception.py |   15 +++++++++++++++
 heat/api/v1/stacks.py     |   34 ++++++++++------------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

commit 9ccf18433e421bb769b77ce0991a3ffca05adc36
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 21 11:01:25 2012 +0100

    heat API : move aws common files from api/v1 to api/aws
    
    Move aws api common files to common directory
    (so they can be more easily reused by cloudwatch)
    
    Change-Id: I1a455ef11226dd960503bac5d79fa5c28607a1f6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 etc/heat-api-paste.ini    |    2 +-
 heat/api/aws/__init__.py  |   14 +++
 heat/api/aws/ec2token.py  |  148 +++++++++++++++++++++++++++++
 heat/api/aws/exception.py |  226 +++++++++++++++++++++++++++++++++++++++++++++
 heat/api/v1/__init__.py   |    2 +-
 heat/api/v1/ec2token.py   |  148 -----------------------------
 heat/api/v1/exception.py  |  226 ---------------------------------------------
 heat/api/v1/stacks.py     |    2 +-
 heat/tests/test_api_v1.py |    2 +-
 9 files changed, 392 insertions(+), 378 deletions(-)

commit d7abb038c5fc5e6f597d78f80f6a8a186c82ac9f
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 21 10:48:33 2012 +0100

    heat engine : Fix engine.api variable shadowing
    
    Fix weird-looking/confusing variable shadowing in
    the engine api
    
    Change-Id: Ic7aca18ef877149bbdb49ee33abc62241706a3f3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/api.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f48c114a4fa95a77f8bd00b399871d6c2e554b05
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Aug 20 13:01:23 2012 +0100

    heat tools : glance-jeos-add-from-github avoid duplicates
    
    Avoid adding images to glance when they already exist
    
    Change-Id: Ia914cc3015fcdcc0c12e3773985298fce6872751
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/glance-jeos-add-from-github.sh |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit f521e53fa34b92b5ef75adbf897b558834c24d4b
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Aug 20 12:46:23 2012 +0100

    heat tools : glance-jeos-add-from-github scrape image names
    
    Scrape image names from github index page to avoid hard-coded
    names in the script
    
    Change-Id: Ifca85b71a1c20d436486a80cc5e9347a7791e5fa
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/glance-jeos-add-from-github.sh |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

commit 8b5756535a3a21252d416af578a5bc07308b6309
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Aug 17 15:36:28 2012 -0400

    Inject command into userdata
    
    The injected command touches /var/lib/cloud/instance/provision-finished
    so it is easily determinable if provision has been completed.
    
    Change-Id: Ib5b93f7bd14f533af41182ffdab6a029a3b9e13a
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/engine/instance.py |    1 +
 1 file changed, 1 insertion(+)

commit b4c6513a76bff8989d74cb658aaaf6f61c152188
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Aug 17 10:11:21 2012 -0700

    Add a tool to register prebuilt JEOS images into glance from github
    
    Change-Id: Idb02e892f390516557c9cce3ca0fbab7109d33e1
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/README                         |    6 +++++-
 tools/glance-jeos-add-from-github.sh |    8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

commit d1a6e3465de21a6c09cca8c5a09d7506332ff899
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 15 17:11:56 2012 +0100

    heat template : Align two Openshift template varieties
    
    Align the build-from-scratch Openshift.template with the
    now-working OpenShift_Prebuilt_JEOS.template
    
    Change-Id: I8d164b0837b4cb28a6ce4ad1573b19f8daf68b8a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 templates/OpenShift.template |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

commit 87b914cf7074fb0fd23ba33768390850162011ac
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Aug 16 10:50:05 2012 -0700

    Use cached keystoneclient
    
    Change-Id: I787edd10bcc29746a08878fd371204f81f0400db
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a9252c9b0583b61579c123d4c31b790d4d3ef07c
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 15 15:16:23 2012 +0100

    heat cli : Workaround inconsistent boto return type
    
    Work around the inconsistent boto return type for DescribeStackResource
    action, upstream patch pending but not yet merged, so this provides
    a simple workaround
    
    Fixes #175
    
    Change-Id: I026ec7b1845fb591a47a5fb12cfcb25705b33909
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat            |    2 +-
 heat/boto_client.py |   19 +++++++++++++++++++
 heat/client.py      |    3 +++
 3 files changed, 23 insertions(+), 1 deletion(-)

commit 5aa80047b65488fa02f23818ca9132e523cb8693
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 15 14:09:54 2012 +0100

    heat cli : Rework to separate cli tool from client-API wrappers
    
    Rework to remove duplication between heat and heat-boto, and to
    provide better separation between the CLI tool logic and the
    underlying client API (should allow easier porting to new ReST API)
    
    Ref #175 (partially fixes)
    Fixes #192
    
    Change-Id: Ib1f821667c40c78770a345204af923163daeffae
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat            |   94 ++-----
 bin/heat-boto       |  732 +--------------------------------------------------
 heat/boto_client.py |  273 +++++++++++++++++++
 heat/client.py      |   50 +++-
 4 files changed, 349 insertions(+), 800 deletions(-)

commit 619239527f7f5ae1bea30cba3d3bc453238b14bf
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 14 17:27:16 2012 +0100

    heat cli : remove some duplication from parameter formatting
    
    Cleanup - bin/heat move some duplicated code into a function
    
    Change-Id: Ib74077c557a2b8d7c640ee1686237bb5223b2a85
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat |   42 ++++++++++++++----------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

commit c2382317de4693ee366de99938899ed00685b8ec
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 14 17:15:08 2012 +0100

    heat cli : remove unused paths from heat cli tool
    
    Cleanup the the jeos and cfntools paths which are no longer needed
    
    Change-Id: Idc7d37446a0072e38369939cbd3fd5fb374c15c9
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat |   12 ------------
 1 file changed, 12 deletions(-)

commit 08836e32499274c453fbc0a079af6eb197e3965d
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Aug 14 09:07:44 2012 -0700

    Update Getting started to match change to heat-jeos
    
    heat-jeos list will no longer list jeos in the image name.  As a result,
    we can't specify "-jeos" in the getting started guide.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 docs/GettingStarted.rst |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit ff967194048e1e579db210ddad2df3af49ec1430
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Aug 14 15:56:13 2012 +0100

    heat api : bugfix, save config correctly in EC2Token
    
    Fix issue where EC2Token fails to save the config correctly,
    which breaks AWS Authentication
    
    Fixes #191
    
    Change-Id: I77dfe182aac81c55b7d487d88073b40eac1faadd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/ec2token.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 005b613f8b0ca87428b614f2a2ca90865806be6c
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Aug 13 14:31:12 2012 +0100

    heat templates : Add openshift template for pre-built jeos
    
    Add new openshift template which uses a pre-built JEOS
    also creates the example application allowing a fairly
    quick full demo of a two-instance openshift setup
    
    Fixes #186
    
    Change-Id: I9bd886b0717c8b0d810eff036b76883b537c2421
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 templates/OpenShift_Prebuilt_JEOS.template |  165 ++++++++++++++++++++++++++++
 1 file changed, 165 insertions(+)

commit a013d1dc9e20acc1fefd44b0da03719207d1a4d7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Aug 13 13:54:52 2012 +0200

    Getting Started: Add configuration info for the metadata server
    
    Change-Id: Ie99bfd1c5e7bcaedd7757872d7d618d2cf29b137
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit aa21f73f3e530f1f9f5067bc7dcd980b9ac21a44
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Aug 10 19:16:01 2012 +0200

    Getting Started: Use install.sh script
    
    Change-Id: I7f189f8d3e0557503eca23a5489a98589bfff4f3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

commit e611c7a5178e3607aa64f557535e7dc58f6d9af0
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Aug 13 15:59:49 2012 +0200

    Make template params resolution standalone
    
    This makes the two functions for resolving template data (Fn::FindInMap,
    Ref, etc.) available outside of a Stack object.
    
    Other programs can then import these functions and see how the template
    parameters get resolved.
    
    Change-Id: I92de937a3fb25f907404335cb71554036a807c50
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/engine/parser.py |   42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

commit 70bdc38a44b6ec4db40b8e1b5d7c2b6f398e27e1
Merge: 69cfc12 7f8c5fa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 10 19:06:22 2012 +0000

    Merge "change amd64 reference to x86_64 to match latest cfntools"

commit 7f8c5fabedda986f8a055b07bbbfdf2f9905fa81
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Aug 10 11:39:31 2012 -0700

    change amd64 reference to x86_64 to match latest cfntools
    
    Change-Id: I11f4bd974326c7f1b4e287389b22c5ec3f20bdf9
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_Single_Instance_deb.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 69cfc124bc5d30fe598d41d42221cac56b369fbf
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Aug 8 14:58:51 2012 -0700

    Remove crankcase patch since fix was merged upstream
    
    Added a patch to force yum to retry indefinately on crankcase builds
    because the OpenShift repositories were too busy.  I submitted this upstream
    in:
    
      https://github.com/openshift/crankcase/pull/336
    
    and it was merged.
    
    As a result, removing this workaround.
    
    Change-Id: I26e0a162d5cfb4bc23843c93678318ff21610973
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/OpenShift.template |   59 ------------------------------------------
 1 file changed, 59 deletions(-)

commit ec45dd77c02c113af74002a65dd415758f412875
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Aug 6 17:17:31 2012 +1000

    Add calculate_properties() to update() and restart_resource()
    
    This is the same fix as 783b1112490ef07db05251c1258c04f8b1caa5a0
    
    Change-Id: I17a30b0c670dee5b228b4af8dad06ad109471e5d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit e432874d5f980f961dd3386058780c2b71ef95f7
Merge: 31718b1 dedb947
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 4 03:14:00 2012 +0000

    Merge "Log all startup operations to /var/log/heat-startup.log"

commit 31718b1e145832d23dca66481a9a904ec761db24
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Aug 3 19:31:22 2012 -0700

    Force rpm to retry indefinately during crankcase build
    
    If RPM is not forced, sometimes packages will fail to download within the
    default 10 retries.  This results in crankcase failing to build OpenShift.
    
    Change-Id: I5174928fc2ac205dcd7818ecf1da6b8e32f48e08
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/OpenShift.template |   86 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 75 insertions(+), 11 deletions(-)

commit dedb9475a91fc4833adf4a5201c5898b09081ad2
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Aug 3 16:42:46 2012 -0700

    Log all startup operations to /var/log/heat-startup.log
    
    Change-Id: I0e7f415e7aee60c09d0b5b172742af7a5b313191
    Signed-off-by: Steven Dake <sdake@redhat.com>

 MANIFEST.in                   |    1 +
 heat/cloudinit/loguserdata.sh |    3 +++
 heat/engine/instance.py       |    4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

commit c8b47d80ed9697559c6dfafa9ecd684d6f9b7980
Author: Steve Baker <steve@stevebaker.org>
Date:   Thu Aug 2 17:32:07 2012 +1200

    Port existing rpc calls to use the new RPC client API.
    
    Patch 2/2, this implements github heat issue 181.
    
    test_api_v1 was modified to handle the extra rpc arguments.
    
    metadata_register_address hasn't been included in EngineAPI, and it
    possibly doesn't deserve to. This means that bin/heat-metadata has the
    only remaining raw rpc call.

 heat/api/v1/stacks.py            |   89 ++++++++++++++------------------
 heat/common/config.py            |   13 +++--
 heat/metadata/api/v1/metadata.py |   43 +++++++---------
 heat/tests/test_api_v1.py        |  104 ++++++++++++++++++++++++--------------
 4 files changed, 129 insertions(+), 120 deletions(-)

commit e05f39c37b115259cf64e2523d7da443507f389c
Author: Steve Baker <steve@stevebaker.org>
Date:   Fri Jul 27 21:57:59 2012 +1200

    Implements a client side engine RPC API.
    
    Patch 1/2, this implements github heat issue 181.
    
    The topic string for the rpc call is built from the cfg.CONF parameters 'host'
    and 'engine_topic' defined in heat.common.config.engine_opts.
    
    delete_stack seems to be the only method which returns nothing, so it can be
    invoked as cast or call, with cast being the default.
    
    The tests exercise each api method with the same approach found in
    nova/nova/tests/compute/test_rpcapi.py
    
    Change-Id: Ia20850821083d1236ad628172db00d01f073313c

 heat/common/config.py     |    3 +
 heat/engine/rpcapi.py     |  221 +++++++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_rpcapi.py |  167 ++++++++++++++++++++++++++++++++++
 3 files changed, 391 insertions(+)

commit ea2db73166c393187ba0db039e5974c0f2333023
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Aug 1 14:27:55 2012 +0100

    heat templates : update Openshift template to add node instance
    
    Update openshift templat to add a second instance running
    the node to the existing broker.  Move to crankcase master
    and attempt to work around build issues.
    
    Ref #186
    
    Change-Id: If7d1b39e1072d3934f37817be3d7773edd7785c3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 templates/OpenShift.template |   90 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 11 deletions(-)

commit 044887521ec2c38231458c3928af6956dc16119a
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Aug 2 14:37:13 2012 +0100

    heat : Make instance flavors consistent
    
    Add additional instance flavors to align templates with
    nova
    
    Fixes #179
    
    Change-Id: I586e57748c9b0a0c7594746399d5328da788efcd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/instance.py      |   15 +----------
 heat/tests/test_instance.py  |    4 ---
 heat/tests/test_stacks.py    |    1 -
 tools/nova_create_flavors.sh |   60 ++++++++++++++++++++++++++++++++++++++++++
 tools/openstack              |    2 ++
 5 files changed, 63 insertions(+), 19 deletions(-)

commit 1ed94e1382166ccf50f116645b4d20dcd2c74e7f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Aug 2 13:15:53 2012 +0100

    heat engine : raise appropriate error for incorrect stack_name
    
    Raise an AttributeError instead of returning a string when passed
    an incorrect stack name, this then maps to the appropriate error
    in the API.
    
    Fixes #182
    
    Change-Id: I7fe80496883bfbe515d9c235de812aaa14c41c12
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c69f3892c2563cefdc26e6bdb54bc2c2e7c7cae5
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jul 27 14:43:37 2012 +0100

    heat API : Return correct AWS error response for invalid parameter
    
    Passing template parameter values which are not in AllowedValues
    makes the engine throw a ValueError exception, which should be
    mapped back to HeatInvalidParameterValueError so that the API
    error response is correctly formatted.
    
    Fixes #180
    
    Change-Id: I8615cb7fbbbfd21a403a4973fe0a63300c6cf852
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e3e011b9cb1273f0d05f87c67b76a3b07dbc20e9
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Jul 31 14:50:17 2012 +0200

    Bump to v6
    
    Heat version 5 is released, let's start working on 6.
    
    Change-Id: Icd0db5c0a9317d17ae4c2f161d50da8b5c50c40e
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2779760de5d47d7368e541a5a631b041ca4eda1b
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 30 18:53:23 2012 +0100

    heat engine : Avoid writing to class-scope parameters schema
    
    Fixes issue where multiple instances of the same resource types
    which have different parameters break, because the parser is
    writing back to the class-scope properties_schema which should
    be immutable.  This patch fixes by making a per-instance copy.
    
    Fixes #183
    
    Change-Id: Ia29f67465acbcfaf8dfe511ddaa9075bc48157ad
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/checkeddict.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 8f0caacf8a93bb515b75803e1a53692e4d4deaf0
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Jul 30 17:56:44 2012 +0200

    Update getting started with credential crypto
    
    We encrypt the sensitive information in the database now. This updates
    the Getting Started guide to generate an encryption key.
    
    Change-Id: I44a96302e736997a747f82c9d23006425396633f
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 docs/GettingStarted.rst |    1 +
 1 file changed, 1 insertion(+)

commit bdf59084b65074c7cfaab8d9ade3b5932fbf8c11
Author: Ian Main <imain@redhat.com>
Date:   Fri Jul 27 09:41:25 2012 -0700

    Add tools directory to python package.
    
    This adds the tools/ dir to the tarball for distribution.
    
    Change-Id: I82a18df568bf2d7421a49e057e80a7bc236e2078
    Signed-off-by: Ian Main <imain@redhat.com>

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit b6d2608dd2f38168f004471a74c8f3add2008964
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Jul 27 14:37:17 2012 +0200

    Don't use uuidgen in install.sh
    
    uuidgen is not present in Ubuntu. This simply reads 16 bytes from
    /dev/random and stores their hex representation.
    
    Change-Id: If1152242b024218f20bd4c787e03836f0d5f49cf
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 install.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 58cd52624b50476ed5ed1c5c0ba7cb1b4d7ba66d
Author: Ian Main <imain@redhat.com>
Date:   Thu Jul 26 12:57:57 2012 -0700

    Add encryption support for authentication information in db.
    
    This patch uses an encryption key generated in install.sh to perform
    symmetrical encryption on sensitive authentication information stored
    in the database for HA operations.
    
    Change-Id: Ifd09f3f566ba3ebd941a6f453953576011b518b9
    Signed-off-by: Ian Main <imain@redhat.com>

 etc/heat-engine.conf      |    2 ++
 heat/db/sqlalchemy/api.py |    7 +++++++
 heat/engine/auth.py       |   35 +++++++++++++++++++++++++++++++++++
 install.sh                |    2 ++
 4 files changed, 46 insertions(+)

commit e646e66728e5ca9f627c56137a40c74a195060a1
Author: Ian Main <imain@redhat.com>
Date:   Wed Jul 25 12:02:53 2012 -0700

    Change to per-tenant stacks.
    
    This patch switches from per-user stacks to per-tenant stacks.
    
    Change-Id: Ia7ac65033560bcff1db83d4d673945029e06ea6a
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/db/api.py                                     |    8 ++++----
 heat/db/sqlalchemy/api.py                          |   14 +++++++-------
 .../migrate_repo/versions/011_stack_tenant.py      |   20 ++++++++++++++++++++
 heat/db/sqlalchemy/models.py                       |    1 +
 heat/engine/manager.py                             |    4 ++--
 heat/engine/parser.py                              |    1 +
 heat/tests/test_stacks.py                          |   16 ++++++++++------
 7 files changed, 45 insertions(+), 19 deletions(-)

commit 3c6e40f2bb9039dfae60307ea730199973ddc247
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 25 21:45:09 2012 +1000

    Make a template that demonstrates instance monitoring and restarting.
    
    We use cfn-push-stats to send a heartbeat and if we don't get
    it within the set interval we restart the instance.
    
    Other changes to make this work:
    - clear the waitcondition when it is deleted.
    - set the resource id to None when deleted, else it won't re-create
      properly.
    - don't run watch alarms if the stack is not completed.
    
    Change-Id: I5dfc8b372f557cf43379c6c5b7436d1010f83e3c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py                             |   16 +-
 heat/engine/parser.py                              |    4 +-
 heat/engine/resources.py                           |    2 +
 heat/engine/wait_condition.py                      |    8 +
 .../WordPress_Single_Instance_With_IHA.template    |  232 ++++++++++++++++++++
 5 files changed, 255 insertions(+), 7 deletions(-)

commit 783b1112490ef07db05251c1258c04f8b1caa5a0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 25 12:36:35 2012 +1000

    Call calulate_properties() before calling FnGetAtt()
    
    The problem is that in the delete the order of resolution is reversed
    so in delete loop we have not yet done a calulate_properties() on the
    resource that we are about to call FnGetAtt() for.
    
    Fixes #178
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
    Change-Id: I8af6f8a78086a7b1f2bcc280d57af0b4311f08cc

 heat/engine/checkeddict.py |    5 +++--
 heat/engine/parser.py      |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

commit 8c3f0f14a5f2b41f0a7f4922a3100c0797feaddd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 24 19:04:07 2012 +1000

    Log the error when a resouce fails to delete
    
    Also bail out of handle_delete if instance_id is None
    
    Change-Id: I2bd77345ac35860201006a23999a06dd81ac6fe0
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/instance.py |    2 ++
 heat/engine/parser.py   |    2 ++
 heat/engine/user.py     |    2 ++
 3 files changed, 6 insertions(+)

commit f1eabe8073549cbcea47b1ae6c927e2e1948d33e
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 24 17:58:06 2012 +0100

    heat API : Add more tests covering error paths
    
    Add some more tests testing error path responses
    
    Change-Id: I10f3b599f8a0f5daad84752042079a591968de09
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/test_api_v1.py |  213 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 213 insertions(+)

commit f95e459e80625150e91413f54a76090163fc7bb0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 24 16:48:55 2012 +1000

    delete duplicate validate() method
    
    probably a merge conflict.
    
    Change-Id: Ibe8941ab471943b7385ceb4b4d4559719a7092b6
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    3 ---
 1 file changed, 3 deletions(-)

commit 8a7ea792b00fa470270d85b3d08f210b5e98b78f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 24 14:09:29 2012 +1000

    loadbalancer: implement Interval and Timeout
    
    Change-Id: I74abc742371cb23ddfe38f83812662a9d42f3d43
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/loadbalancer.py |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

commit 27e612a77bdde87d417d502251553352fafc8870
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 24 14:03:24 2012 +1000

    autoscaling: implement DesiredCapacity
    
    Change-Id: I1403f7857e03795aa4773f9a3f1fc8f082526477
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/autoscaling.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 591377489f615e475ca72e2b7bbbcaa88c29e8d5
Merge: 1206b18 8bd9ed0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 24 04:54:19 2012 +0000

    Merge "Get rid of PyCrypto dependency"

commit 1206b18cbd24774a2397f905da323c57ebee2be4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jul 23 19:39:41 2012 -0400

    Update GettingStarted guide to use correct state name
    
    This changed from IN_PROGRESS to CREATE_IN_PROGRESS in
    0191587ac6a79509576e2043412020d9c4257b47.
    
    Change-Id: If1cb20f6a16e719ee423db937b591b575fd4a038
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 8bd9ed0bd8e51291e549751abd5821e8263e820d
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jul 23 18:15:49 2012 -0400

    Get rid of PyCrypto dependency
    
    The origin of this code is from Glance and is not used in Heat.
    
    Change-Id: I4a22974e24fb277aea79212f0aee2f7e85a0ea76
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/common/crypt.py |   65 --------------------------------------------------
 1 file changed, 65 deletions(-)

commit 025b5f907d90ae7778e799fb37f5a3df83c16f50
Merge: 64f9b72 9c75b6d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 23 17:47:48 2012 +0000

    Merge "Add AWS::RDS::DBInstance"

commit 64f9b72c8e41d736cf2b8be447a940333b37149a
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 23 17:43:39 2012 +0100

    heat API : Add more unit tests
    
    Add more unit tests to improve API test coverage
    
    Change-Id: I5f3a8933a9a09acb6b904ccc76ec20ad210a5974
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/test_api_v1.py |  540 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 534 insertions(+), 6 deletions(-)

commit 9c75b6d3b0160d43be62f75d8f56e218d5809831
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Jul 18 15:39:37 2012 +0200

    Add AWS::RDS::DBInstance
    
    Fixes #163
    
    This is an initial implementation of the DBInstance resource type and a
    sample Wordpress template showing it off.
    
    Change-Id: I5e156dc58eee563ae9de068664bafa1af1fb5ffe
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/engine/dbinstance.py             |  203 +++++++++++++++++++++++++++++++++
 heat/engine/resource_types.py         |    2 +
 templates/WordPress_With_RDS.template |  167 +++++++++++++++++++++++++++
 3 files changed, 372 insertions(+)

commit 312a84ec70ffc3cbbc9b1cbb2f8c62e4d21e97c8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 23 20:12:05 2012 +1000

    autoscaling: don't kill all instances when scaling down
    
    only delete the difference between the old capacity and the new capacity
    
    doh!
    
    Change-Id: Idbb16b2fa93abcad2793d5b4365c18a01e588b99
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/autoscaling.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit deebc5c42aa900ee1543c6d6d791fea3e274cd4e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 23 14:58:11 2012 +1000

    make the autoscaling template easier to debug
    
    shorten the period and lower the thresholds
    
    Change-Id: I3d621fadacc6e77002d100cf725d970671475106
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/AutoScalingMultiAZSample.template |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit c91b8d53f2597b3626c78037e9f3df52d9a19ca7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 23 14:48:29 2012 +1000

    Return the name from the autoscaling group not the instance.
    
    the default is to return an instance_id if it is  not none.
    
    Change-Id: Ide5dcb3da5d992683dd235f1b53b264455a9fd07
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/autoscaling.py |    3 +++
 1 file changed, 3 insertions(+)

commit b48d869244209c23b506696bc6f8192254fda4aa
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 23 13:09:19 2012 +1000

    Add python-psutil and fix cfn-push-stats options
    
    Change-Id: Ic88e1e886c5f8ccbcbc5bc49fa612366c7faeae5
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/AutoScalingMultiAZSample.template |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit b34a5cd51d66b2a8ae4fb03d8108d0e0f6e3faa2
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Jul 20 10:40:22 2012 -0700

    Add an EC2Token_filter_factory and use it as the default paste filter
    
    Change-Id: I70989ff6be655832497e1e8a3019497438a739fb
    Signed-off-by: Steven Dake <sdake@redhat.com>

 etc/heat-api-paste.ini  |    3 +-
 heat/api/v1/__init__.py |  100 --------------------------------
 heat/api/v1/ec2token.py |  148 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 149 insertions(+), 102 deletions(-)

commit 0191587ac6a79509576e2043412020d9c4257b47
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 17 15:46:49 2012 +0100

    heat api/engine : Implement UpdateStack functionality
    
    Implements initial support for UpdateStack, currently
    all resources default to delete/create on update.
    Ref #171
    
    Change-Id: I3e6e63143d554c21ccdee19879c4dfb8b6e693d7

 heat/api/v1/stacks.py         |   28 ++++++--
 heat/db/api.py                |    4 ++
 heat/db/sqlalchemy/api.py     |   21 ++++++
 heat/engine/autoscaling.py    |    3 +
 heat/engine/cloud_watch.py    |    3 +
 heat/engine/eip.py            |    3 +
 heat/engine/instance.py       |    3 +
 heat/engine/loadbalancer.py   |    3 +
 heat/engine/manager.py        |   40 +++++++++++
 heat/engine/parser.py         |  158 ++++++++++++++++++++++++++++++++++++-----
 heat/engine/resources.py      |   67 +++++++++++++++++
 heat/engine/security_group.py |    3 +
 heat/engine/stack.py          |    3 +
 heat/engine/user.py           |    6 ++
 heat/engine/volume.py         |    6 ++
 heat/engine/wait_condition.py |    5 ++
 heat/tests/test_parser.py     |    2 +-
 17 files changed, 335 insertions(+), 23 deletions(-)

commit 8fb2ad1e28aba2b99a7faa8a91efcd5b786cdac1
Merge: 0f4c86b 912a4fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 20 14:20:23 2012 +0000

    Merge "heat db : fix per-object delete"

commit 912a4fc7a706bdf08ee731e0430256a326ca9d34
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jul 20 11:17:08 2012 +0100

    heat db : fix per-object delete
    
    Fixes problem where per-resource destroy() operations do not
    delete the underlying database row because the model delete
    method is broken
    
    Change-Id: I3562c9048f8d4e54c1ea51090e74abe982ffb330
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/db/sqlalchemy/models.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 0f4c86bd3a13b5f8ff2e57b727709c7ff46aeea4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 20 16:08:32 2012 +1000

    Combined autoscaling and loadbalancer
    
    Change-Id: Ib2cff867eb5d9fbee8cedb828e9c35a93436cbe5

 heat/engine/autoscaling.py                  |   47 +++++-
 heat/engine/cloud_watch.py                  |    1 +
 heat/engine/loadbalancer.py                 |   73 +++++++-
 heat/engine/resource_types.py               |    1 +
 heat/engine/resources.py                    |    3 +
 heat/metadata/api/v1/metadata.py            |    2 +-
 templates/AutoScalingMultiAZSample.template |  243 +++++++++++++++++++++++++++
 7 files changed, 359 insertions(+), 11 deletions(-)

commit 06705da563935a5097a3a502ede1c349e14656ac
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jul 19 19:51:47 2012 -0700

    Optimize filter context
    
    Just use a direct filter factory for ContextMiddleware
    
    Change-Id: Ie17bb88c331bdb4354d0abb24346ab80f13cd323
    Signed-off-by: Steven Dake <sdake@redhat.com>

 etc/heat-api-paste.ini      |    3 +--
 etc/heat-metadata-paste.ini |    3 +--
 heat/common/context.py      |   18 +++++++++++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

commit 8ced4770697bf87d96554391778bbf3585ddbbee
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 19 15:01:01 2012 +1000

    convert to float instead of int in the watch rule
    
    as the data sent from the guests are likely to be floats.
    
    Change-Id: Ice17c23997150db8c52c50767ed94fce8b182d4b
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/watchrule.py |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit be3c066ab87cc6e1a2ca8c097eeccd9217d7329a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 19 18:35:59 2012 +1000

    Allow nested stacks to be retrieved by name
    
    When getting the stack by name in the metadata server
    we don't know the owner_id so allow retrieval just by name.
    
    I suspect this will be a short term solution until we get proper
    stack names.
    
    Change-Id: I8845b2b33a5bae30aae66c06af01c1a27c990305
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/db/sqlalchemy/api.py |   10 +++++++---
 heat/engine/manager.py    |    3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

commit f046a6c2e259aaea4f103b00c5c2bd04aa5db209
Merge: 6029c03 466e998
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 18 11:58:09 2012 +0000

    Merge "Don't require user params on template validation"

commit 6029c031eac1ca8cdf833300d79de49717ecb137
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Jul 18 13:34:03 2012 +0200

    Use eventlet's wsgi again
    
    Ref #55
    
    This adds a monkey patch for the eventlet's maximum url length issue (ref #18).
    With it, we can use eventlet as our wsgi server again.
    
    Once Eventlet releases a new version (the fix is already in master) we'll drop
    the monkey patch and set the limit proper.
    
    Change-Id: Ia122af8d53b49587ade0ead6897fdd10107f4a87
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 bin/heat-api          |    7 ++++---
 bin/heat-metadata     |    5 +++--
 heat/common/config.py |    3 ---
 heat/common/wsgi.py   |    8 +++++++-
 4 files changed, 14 insertions(+), 9 deletions(-)

commit 466e9983d0c855b03b64227c607fdd7125f3ae8c
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Jul 12 18:04:54 2012 +0200

    Don't require user params on template validation
    
    Fixes #161
    
    Change-Id: Ia7e1a83043f8d175e320bfd52aa64cb6f62ead90
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/engine/manager.py      |   38 +++++++++++++++++++++++---------------
 heat/tests/test_validate.py |    4 ++--
 2 files changed, 25 insertions(+), 17 deletions(-)

commit cf56c2613b4a7317d57d97506167c2fd8cf27e42
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jul 18 12:09:22 2012 +1000

    tools: erase openstack-utils only after using it.
    
    else we just get: "sudo: openstack-db: command not found"
    
    Change-Id: Iaad3353a7f3c64fe8fbb2f0686c24e97467efb66
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 tools/openstack |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 97d8118f6e9a072e93e0ac59c6c614aff739afed
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Jul 17 17:38:50 2012 -0700

    Update openstack-common
    
    Change-Id: I2d7e169adb9205faa109634a9ae15a9f34e4bd75
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/openstack/common/iniparser.py    |    3 ++-
 heat/openstack/common/jsonutils.py    |    4 +++-
 heat/openstack/common/rpc/impl_zmq.py |    8 ++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

commit 3a4f2225269f4f0f963ff828cb1d88c9b3c5008c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 17 14:55:10 2012 -0400

    Erase openstack-utils when uninstalling OpenStack
    
    Change-Id: I219a57fdd1b600f185cafdb31d611f16c92698c9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/openstack |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bb79672aec6b50b86c087dc7e2bb28d460893bde
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 17 17:33:49 2012 +0100

    heat : update config files with new rpc backend
    
    heat-engine.conf, heat-api.conf, heat-metadata.conf
    should have:
    rpc_backend=heat.openstack.common.rpc.impl_qpid
    to work with the reworked rpc code.
    
    Change-Id: I2e5b136240db2fe8f6dfad27da7e31b2a5053a1c
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 etc/heat-api.conf      |    2 ++
 etc/heat-engine.conf   |    2 ++
 etc/heat-metadata.conf |    2 ++
 3 files changed, 6 insertions(+)

commit e9eee939c7792f857b4be2f085bf05c47642504d
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Jul 17 08:27:19 2012 -0700

    Import openstack.common.rpc
    
    Use openstack.common routines.  One of the parameters changed to
    create_consumer().
    
    Thanks to Russell Bryant for assistance with sorting out that problem.
    
    Change-Id: I4badc7ca22298cd0aafc57a2335b3d6801289be8
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat-api                            |    3 -
 bin/heat-engine                         |    3 -
 bin/heat-metadata                       |    3 +-
 heat/api/v1/stacks.py                   |    4 +-
 heat/common/config.py                   |   99 +---
 heat/manager.py                         |    9 +
 heat/metadata/api/v1/metadata.py        |    2 +-
 heat/openstack/common/excutils.py       |   49 ++
 heat/openstack/common/rpc/__init__.py   |  264 +++++++++++
 heat/openstack/common/rpc/amqp.py       |  418 +++++++++++++++++
 heat/openstack/common/rpc/common.py     |  315 +++++++++++++
 heat/openstack/common/rpc/dispatcher.py |  150 ++++++
 heat/openstack/common/rpc/impl_fake.py  |  184 ++++++++
 heat/openstack/common/rpc/impl_kombu.py |  751 +++++++++++++++++++++++++++++++
 heat/openstack/common/rpc/impl_qpid.py  |  599 ++++++++++++++++++++++++
 heat/openstack/common/rpc/impl_zmq.py   |  721 +++++++++++++++++++++++++++++
 heat/openstack/common/rpc/matchmaker.py |  258 +++++++++++
 heat/openstack/common/rpc/proxy.py      |  161 +++++++
 heat/rpc/__init__.py                    |  206 ---------
 heat/rpc/amqp.py                        |  391 ----------------
 heat/rpc/common.py                      |  129 ------
 heat/rpc/impl_fake.py                   |  188 --------
 heat/rpc/impl_kombu.py                  |  705 -----------------------------
 heat/rpc/impl_qpid.py                   |  507 ---------------------
 heat/service.py                         |   10 +-
 openstack-common.conf                   |    2 +-
 26 files changed, 3891 insertions(+), 2240 deletions(-)

commit b0a0f0c24e9b86ac3ab1862f3be140e79e62ca87
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Jul 17 07:17:20 2012 -0700

    Use global cfg.CONF instead of config classes
    
    Importing rpc.common requires the use of the global cfg.CONF.
    In fact, most of common requires the use of this global.  This
    patch removes all the object specific access to config options
    and directly accesses the global in prep for rpc openstack-common
    import.
    
    Change-Id: I5989a436964c199df0dc38dbb191dc3d867e5ce7
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat-api              |   18 ++--
 bin/heat-engine           |   19 ++--
 bin/heat-metadata         |   16 +--
 heat/common/config.py     |  247 +++++++++++++++++++++------------------------
 heat/db/api.py            |    7 +-
 heat/engine/manager.py    |    3 +-
 heat/engine/resources.py  |    3 +-
 heat/manager.py           |    9 +-
 heat/rpc/__init__.py      |    6 +-
 heat/rpc/amqp.py          |    9 +-
 heat/rpc/impl_qpid.py     |   46 ++++-----
 heat/service.py           |   22 ++--
 heat/tests/test_api_v1.py |    8 +-
 13 files changed, 202 insertions(+), 211 deletions(-)

commit 9d88e8d303fce338bb3d99e83ac96464b193ac9f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jul 16 16:59:41 2012 -0400

    Get rid of eval() in authentication code
    
    This was not secure. Pass the auth data in JSON format rather than as a
    serialised Python object.
    
    Fixes #124
    
    Change-Id: I8e1e9aef790b0af026da2a2d6194da19345be8b0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/client.py         |    3 ++-
 heat/common/context.py |    7 +------
 2 files changed, 3 insertions(+), 7 deletions(-)

commit d06c4ce416ece13d9a34da8002ad896b6a9b0ecc
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 10 18:13:23 2012 +0100

    heat engine/API : Internal API rework
    
    Refactor engine-api code so that AWS specific
    details like key names are handled in the API
    Fixes #172
    
    Change-Id: I4c5b153557216c03e5a98193e54cf75e3c7b97dd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py               |  274 +++++++++++++++++++++++++++++++----
 heat/engine/api.py                  |  145 ++++--------------
 heat/engine/manager.py              |   44 ++----
 heat/tests/test_api_v1.py           |   91 ++++++++++++
 heat/tests/test_engine_api_utils.py |   54 +------
 heat/tests/test_stacks.py           |  147 +++++++++----------
 6 files changed, 452 insertions(+), 303 deletions(-)

commit 90e22dabdea927e4a5a185179dfd1bd7ed566b12
Merge: 8e30817 c7ec88f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 16 03:08:41 2012 +0000

    Merge "Import openstack.common.log and use inside heat infrastructure"

commit 8e30817a93667c9ce62eb0e6ea0f8561f0a40c9a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jul 15 17:04:45 2012 -0400

    Account for XML output in Getting Started script
    
    The output format of heat commands has changed from JSON to XML
    
    Change-Id: I68b4011e31fdb14306e88506dc6ff819b041b054
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

commit f5360d774db303f26217ad8b002d24a1d8a5fc62
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jul 15 16:18:23 2012 -0400

    Fix directory changes in Getting Started script
    
    Change-Id: I3b23b2c0de18d72f91d4a0254e9dbf689ac91be3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 0670b7c3d31bc6ebb47ee121cda4205ae51c3f91
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jul 15 16:18:22 2012 -0400

    Allow non-interactive installation of OpenStack
    
    Pass the arguments to the tools/openstack script through to openstack-db so
    that scripts can use e.g. --yes and --rootpw.
    
    Also use openstack-db --drop rather than heat-db-drop to drop the databases
    for OpenStack services.
    
    Change-Id: I87811ee02d3bfd7cc2dca8b9ab20ea3cfc220e3e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/openstack |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 6eb623580f3694caca284e264a2309ea2342a655
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 1 14:42:12 2012 +0200

    Document Metadata server in Getting Started guide
    
    Change-Id: Id0995df10f329ee3076a2c60ed5eb1548eaa315a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |    2 +-
 tools/uninstall-heat    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit c7ec88f2c7552d4179026b5c091473d2dbc22ae4
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Jul 14 12:18:32 2012 -0700

    Import openstack.common.log and use inside heat infrastructure
    
    Allows heat to match openstack-common log calling conventions such
    as using a context object or instance UUID for better traceability.
    
    Change-Id: Idaa6c04270d9d7143c85988d685c0f9e241b635b
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat-api                                      |    3 +-
 bin/heat-engine                                   |    3 +-
 bin/heat-metadata                                 |    3 +-
 heat/api/middleware/version_negotiation.py        |    3 +-
 heat/api/v1/__init__.py                           |    3 +-
 heat/api/v1/stacks.py                             |    2 +-
 heat/client.py                                    |    4 +-
 heat/db/sqlalchemy/session.py                     |    3 +-
 heat/engine/api.py                                |    2 +-
 heat/engine/auth.py                               |    2 +-
 heat/engine/autoscaling.py                        |    3 +-
 heat/engine/checkeddict.py                        |    3 +-
 heat/engine/cloud_watch.py                        |    3 +-
 heat/engine/eip.py                                |    4 +-
 heat/engine/instance.py                           |    3 +-
 heat/engine/loadbalancer.py                       |    3 +-
 heat/engine/manager.py                            |    3 +-
 heat/engine/parser.py                             |    2 +-
 heat/engine/resources.py                          |    3 +-
 heat/engine/security_group.py                     |    3 +-
 heat/engine/stack.py                              |    3 +-
 heat/engine/user.py                               |    2 +-
 heat/engine/volume.py                             |    2 +-
 heat/engine/wait_condition.py                     |    3 +-
 heat/engine/watchrule.py                          |    2 +-
 heat/manager.py                                   |    5 +-
 heat/metadata/api/v1/__init__.py                  |    3 +-
 heat/openstack/common/jsonutils.py                |  144 +++++++
 heat/openstack/common/log.py                      |  459 +++++++++++++++++++++
 heat/openstack/common/notifier/__init__.py        |   14 +
 heat/openstack/common/notifier/api.py             |  142 +++++++
 heat/openstack/common/notifier/list_notifier.py   |  117 ++++++
 heat/openstack/common/notifier/log_notifier.py    |   35 ++
 heat/openstack/common/notifier/no_op_notifier.py  |   19 +
 heat/openstack/common/notifier/rabbit_notifier.py |   46 +++
 heat/openstack/common/notifier/test_notifier.py   |   22 +
 heat/rpc/__init__.py                              |    3 +-
 heat/rpc/amqp.py                                  |    3 +-
 heat/rpc/common.py                                |    3 +-
 heat/rpc/impl_qpid.py                             |    3 +-
 heat/service.py                                   |    2 +-
 heat/utils.py                                     |   12 +-
 openstack-common.conf                             |    2 +-
 43 files changed, 1063 insertions(+), 41 deletions(-)

commit 5d5d8ba5dd388b5952a4fe4f614409ba07d3bd9d
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Jul 13 15:30:03 2012 -0700

    Update openstack-common in prep for pulling in common.rpc
    
    Change-Id: Ib3444d97967c807cb96175ce23d4b670a028e9a7
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/openstack/common/__init__.py     |   14 --
 heat/openstack/common/cfg.py          |  108 ++++++++++-----
 heat/openstack/common/exception.py    |    1 +
 heat/openstack/common/gettextutils.py |   33 +++++
 heat/openstack/common/importutils.py  |   17 ++-
 heat/openstack/common/iniparser.py    |    5 +-
 heat/openstack/common/setup.py        |  237 +++++++++++++++++++++++++++------
 heat/openstack/common/timeutils.py    |   36 +++++
 heat/openstack/common/utils.py        |   11 +-
 openstack-common.conf                 |    2 +-
 setup.py                              |    2 -
 11 files changed, 368 insertions(+), 98 deletions(-)

commit fba2ed3921b132621a42c95eb2230829273f431e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 13 16:46:20 2012 -0400

    Set the stack updated time through the Timestamp
    
    Don't allow the resource class to modify the parent stack's database
    representation directly.
    
    Change-Id: Iff93d1430f4cb0695e729d0cf8f784ccb2ed7598
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources.py |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit bfd7fcf8f5642e99df9ada33a5c39e5c1a0f89c5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 13 16:46:20 2012 -0400

    Eliminate DB access from the engine API
    
    Access all data through the Stack and Resource objects.
    
    Fixes #168
    
    Change-Id: I0331a0ad67bcd11bb678e026ddc7b7c954517bc4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/api.py |   21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

commit 07be1d72699d051a58697962fff5c39a11d48544
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 13 16:46:19 2012 -0400

    Make timestamps available in Stack/Resource objects
    
    Provide the creation time and last-updated time as attributes of Stack and
    Resource objects so that external code does not need to access the database
    in order to retrieve them. Use a Descriptor class so that the latest values
    are always fetched from the database.
    
    Change-Id: Ic3fa173b1dc8f2e5dc676a9152e8928ed2290913
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parser.py       |    7 +++++--
 heat/engine/resources.py    |   29 +++++++++++++++++++++++++++++
 heat/tests/test_parser.py   |   34 +++++++++++++++++++++++++++++++++-
 heat/tests/test_resource.py |   21 +++++++++++++++++++--
 4 files changed, 86 insertions(+), 5 deletions(-)

commit b0ec4877992c6660bedadbb53ea1d7c1503bc513
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jul 13 16:08:53 2012 +0100

    heat cli : Manpage updates
    
    The heat cli tool manpage had very little information,
    this adds detail to the existing page and copies a version
    of this page to cover the heat-boto version of the tool.
    
    Change-Id: I5b64466878b719b49a9084f301b2c177ddef9a91
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 docs/man/man1/heat-boto.1 |  198 ++++++++++++++++++++++++++++++++++++++++++
 docs/man/man1/heat.1      |  211 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 398 insertions(+), 11 deletions(-)

commit c16b10255d1aabf0884cf27b55f486b9e8901aed
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jul 13 10:31:42 2012 +0100

    heat engine : fix create_stack response format
    
    create_stack response is broken now the StackId formatting
    is done in the API, modify response format to fix.
    
    Change-Id: I013bdb5ed992ce735905225cc4415fc0cfc5ce92
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0fc46d513477865fe8abfd54ad9529fda413060f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 12 17:46:46 2012 +0100

    heat API : Add missing StackId prefixes
    
    Align event-list and resource-list-details with
    other calls which add a AWS-style prefix to the
    StackId response element
    
    Change-Id: I0b1951068448d141e04ddca44f1d4188d3dff360
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 5336c986510a4b075a35a0233d59a1e69b6f4576
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 12 17:37:37 2012 +0100

    heat engine : move StackId formatting into API
    
    Move AWS specific StackId formatting into the API
    Ref #172
    
    Change-Id: I02f964b63c0489800300d8db92e1c800286c4bd3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py |    3 ++-
 heat/engine/api.py    |    6 +++---
 heat/engine/parser.py |    7 -------
 3 files changed, 5 insertions(+), 11 deletions(-)

commit 581b0c6f6adc4480fc7c03eb96abda821c89b1a7
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jul 12 08:38:51 2012 -0700

    Block on instance delete until delete operation completes
    
    Fixes issue #160
    
    During deletion of a stack, following would occur:
    delete stack
    delete instance
    delete eip or security group
    
    When the last operation occurred, the instance is still present in OpenStack
    making a deletion of EIP or security groups not work properly.  Serialize
    the operations in resources.
    
    Change-Id: I6e1613f5a6f5db485dd8a5f381d7a96afb58188b
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/instance.py |    9 +++++++++
 1 file changed, 9 insertions(+)

commit a7d3879d7c7c3d67d6d58a05fed1319b52bf082f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 12 12:56:44 2012 +0100

    heat engine : Store stack timeout in database
    
    Store the TimeoutInMinutes common query parameter
    value in the DB so it can be returned correctly
    with show_stack/DescribeStacks
    ref #125
    
    Change-Id: I4ccc79b586087f61e415d5d2c24b7bd52844399a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 .../versions/010_add_stack_timeout_col.py          |   25 ++++++++++++++++++++
 heat/db/sqlalchemy/models.py                       |    1 +
 heat/engine/api.py                                 |    3 ++-
 heat/engine/manager.py                             |   11 +++++----
 heat/engine/parser.py                              |   13 ++++++----
 heat/tests/test_engine_api_utils.py                |   10 ++++----
 6 files changed, 48 insertions(+), 15 deletions(-)

commit 82138f48bdc3c078df680b70bd4196c66fee1129
Merge: 4da17a9 a82114f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 12 10:25:14 2012 +0000

    Merge "Update JEOS example in Getting Started"

commit 4da17a9b8b2523cfe5fa0d25b65dd970f3988131
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Jul 12 11:52:02 2012 +0200

    Display better message on Keystone failure
    
    Fixes #148
    
    When there's something wrong with Keystone, Heat reported a rather cryptic
    message. Now it indicates that the problem is with Keystone and passes
    its response to the user.
    
    Change-Id: I791b5bdfa68faa1b17daa67b911253d8bf8a2bb8
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/common/auth.py      |    7 ++++++-
 heat/common/exception.py |    9 +++++++++
 heat/utils.py            |    5 +++++
 3 files changed, 20 insertions(+), 1 deletion(-)

commit 8cbd065bf0124290a828320f9087ce9183ee73fc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 15:12:23 2012 -0400

    Speed up metadata server registration
    
    If heat-engine and heat-metadata were started at approximately the same
    time, such that heat-engine was not ready to receive the registration call
    from heat-metadata on the first attempt, it would take a minute before the
    next retry. Instead, start with a very short timeout (2s) and increase it
    if the engine does not show up.
    
    Fixes #159
    
    Change-Id: Ie2efcce667f1dde9ae227a4bb19a1d6a2b7cf135
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-metadata |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit e4eaca5d58b1d59459079d4967b91f3bbc6a1aae
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 10 18:21:56 2012 -0400

    Fix the WordPress puppet template syntax
    
    The template was not valid JSON due to an apparent copy-and-paste error.
    
    Change-Id: I5fb4afe6597b2f469fb5219494feb745d083bf52
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 .../WordPress_Single_Instance_puppet.template      |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8108c0aefb316516061a3db6ae44180b2c26b4d7
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jul 5 14:12:46 2012 +0200

    Optimise DB lookups by ID
    
    SQLAlchemy caches objects in the database per-session, but cannot cache
    queries. A query just generates a list of object primary keys, which is
    then used to fetch the corresponding objects from the cache (if possible)
    or database. Therefore a query which filters by primary key is a waste of
    time, since it just returns (surprise!) the key we started off with. If we
    have the primary key (in this case the id field), just look up the object.
    
    Change-Id: I7123c12372b26c0e1b91b2496921c54d9d992cd8
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/sqlalchemy/api.py |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

commit 5737782c718e84446d8f7f207b3b488ca4473862
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 10 17:53:58 2012 -0400

    Raise the correct error when a stack is not found
    
    Change-Id: Ia96d7b96f61e48d20ab080395365e770cf5bb1a8
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parser.py     |    3 +++
 heat/tests/test_parser.py |    3 +++
 2 files changed, 6 insertions(+)

commit 57a71eb07d393e5f7936b97745cefc6a6520aea9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 11:02:13 2012 -0400

    Access Resource metadata through the new attribute
    
    Get rid of all the other code that was accessing this directly from the
    database and use only the Metadata descriptor.
    
    Change-Id: I36a7a00878d0b65f58ba282ebad78f77b37c4d07
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/instance.py       |    3 +-
 heat/engine/manager.py        |   24 ++++++++----
 heat/engine/resources.py      |    6 +--
 heat/engine/wait_condition.py |   84 ++++++++++++++++++-----------------------
 4 files changed, 57 insertions(+), 60 deletions(-)

commit 139fe4009e8776a3e56ed5023e9745577caacc4e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 18:17:05 2012 +0200

    Add a helper class for metadata
    
    With this patch we can now access resource metadata through the 'metadata'
    attribute and have it always fetch the latest data from the database. This
    reduces the chance of accidentally accessing stale data (due to the
    metadata being updated in a different database session via the metadata
    server) by providing a single implementation to access it through.
    
    Change-Id: Id411ae891d3eace746d16008a7d58bb19b4f652d
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/instance.py       |    4 ++--
 heat/engine/resources.py      |   40 +++++++++++++++++++++++++++++++++++-----
 heat/engine/wait_condition.py |    2 +-
 heat/tests/test_resource.py   |   38 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 75 insertions(+), 9 deletions(-)

commit 7e9d745ee6e326110f155dbb3cac71f112b0ec42
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 10:54:41 2012 -0400

    Add unit tests for metadata read/write in heat-engine API
    
    Change-Id: I2b745a00a2110c794f6228976d3ed1cb9cf59d5f
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_stacks.py |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit f74aef83bf180ddee3cc9a8a2f7de77707e011d1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 10:41:40 2012 -0400

    Avoid unneccesary template parsing
    
    Only parse the parts of the resource template that we need.
    
    Change-Id: I4628e699452dc390848fc15197a5e04a3095399a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/cloud_watch.py |    2 +-
 heat/engine/instance.py    |    2 +-
 heat/engine/resources.py   |   12 ++----------
 3 files changed, 4 insertions(+), 12 deletions(-)

commit 5aac736bb60cfd72887aef2555c3c0cbe24ea6e1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 10:37:47 2012 -0400

    Allow partial template parsing
    
    Make it possible to only parse the section we need when generating the
    parsed template for a resource.
    
    Change-Id: Ib4216d8d7bfdbca81f43690b6e8c53c15c71a232
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources.py    |   13 +++++++++++--
 heat/tests/test_resource.py |   20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

commit 897ccca9ed1039df2b60b0607997cccb06fd913c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jul 9 14:23:31 2012 -0400

    Rename resource_id to resource_name in metadata API
    
    This more accurately reflects what the parameter is, which is just the name
    of the resource within the specified stack.
    
    Change-Id: I6bc26c0046e0493c3b98c5753c04cc5a314678d7
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py           |    4 ++--
 heat/metadata/api/v1/__init__.py |    2 +-
 heat/metadata/api/v1/metadata.py |    5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

commit bd24e183c1a404286f9b701feb18819d353544b9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 20:40:00 2012 +0200

    Report errors from nested stacks
    
    If creation of a nested stack fails, we need to raise an exception so that
    creation of the nested stack resource (and hence the enclosing stack) also
    fails.
    
    Change-Id: Ic5eda7f8d044ed2c87fc0e785b1cd8fcf78071a4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/stack.py |    2 ++
 1 file changed, 2 insertions(+)

commit f5811fb4e92decdd255df40329ab7b242ec9cafc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 11 09:53:40 2012 -0400

    Speed up engine manager unit tests
    
    Refactor the engine manager unit tests so that they all use a single stack
    that is only set up once. This makes the tests run a lot faster, and also
    makes them easier to write. Both should encourage increased testing.
    
    Change-Id: I50d2ffff393d4049459c5c30e408961681c189c7
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_stacks.py |  324 ++++++++++++++++++---------------------------
 1 file changed, 128 insertions(+), 196 deletions(-)

commit 7e56619e4135260065cbee36d1cbee7b936fb9fc
Merge: ccab1c3 3100a89
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 11 12:31:53 2012 +0000

    Merge "Add DB refresh/expire on specific parameters"

commit ccab1c36dc69fb68b9f176bd819f0978fe72d45a
Merge: b96c15c 84841e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 11 12:27:04 2012 +0000

    Merge "Allow Status(Reason) access through Stack/Resource objects"

commit a82114f39bbe00ff60e6c071155966dd70166974
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Jul 11 12:42:58 2012 +0200

    Update JEOS example in Getting Started
    
    The heat-jeos usability branch has merged into master and the command
    syntax for building new images is now a bit different.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
    Change-Id: Ibd4e308fe6ef4d690b0408d59d8a9539a5c81f96

 docs/GettingStarted.rst |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit b96c15c96fcbcf6af8f5c731406b2feaa3f74810
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jul 10 13:56:41 2012 +0100

    heat cli : Align resource-list-details usage with other commands
    
    Align resource-list-details usage with the other heat commands,
    and provide better usage info on failure
    Fixes #156
    
    Change-Id: Id80b377151eca64e5f7dbfb436f5a5da5213c8b3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat      |   78 +++++++++++++++++++++++++++++++++++++++++++++++----------
 bin/heat-boto |   63 +++++++++++++++++++++++++++++++++++-----------
 2 files changed, 114 insertions(+), 27 deletions(-)

commit dd94f3eba2d6540a37b8743c8bd15482149b4c05
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 9 17:54:59 2012 +0100

    heat API: bugfix to XMLResponseSerializer
    
    JSON wrapped in XML responses needs to be serialized
    with json.dumps not str() or quotes get mangled and
    json.loads fails to parse the result
    
    Change-Id: I65c6ddf0be383e71bf8d05e7293b514269a27213
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/common/wsgi.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 3b7e0ae4c615a203ed40a99b8e74f8bd18bdf2b9
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 9 14:58:08 2012 +0100

    heat engine: raise appropriate error on bad stack name
    
    Raise an AttributeError when called with a bad stack name,
    this then maps to the appropriate HeatInvalidParameterValueError
    
    Change-Id: Ic11142e95166ade380c2ad8741ed7063684214fb
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/manager.py    |    9 ++++++---
 heat/tests/test_stacks.py |    5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

commit 3100a898b59b54a581bd5122cc6a3b1ea2f1c4b8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 17:13:09 2012 +0200

    Add DB refresh/expire on specific parameters
    
    Previously we could only refresh or expire the entire object.
    
    Change-Id: I2207349d6ffff435538a577943316cd13e7f1355
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/sqlalchemy/models.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 84841e53fd2db6cc72dbeaec8d3bf1d4d8145552
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 17:03:17 2012 +0200

    Allow Status(Reason) access through Stack/Resource objects
    
    It would be better not to have to go looking in the database for this
    information, so cache it in the Stack/Resource objects themselves.
    
    Change-Id: Id96fbd229898fecc8917a61f19480f70fc2135d9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parser.py       |   26 ++++++++++++++-------
 heat/engine/resources.py    |    3 +++
 heat/tests/test_parser.py   |   23 ++++++++++++++++++
 heat/tests/test_resource.py |   54 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 98 insertions(+), 8 deletions(-)

commit 179bd1154f7a95b668987aac143232f04f4723eb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 17:03:17 2012 +0200

    Rename test_resources to test_instance
    
    Since that's what it's actually testing.
    
    Change-Id: I03556778587e4b1b3a38bf755137eef08455e8f3
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_instance.py  |  144 ++++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_resources.py |  144 ------------------------------------------
 2 files changed, 144 insertions(+), 144 deletions(-)

commit 00cb384e8e65e7b046cbf35e103001350160ba1f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 21:53:36 2012 +0100

    heat API : Return auth errors in AWS format
    
    Update EC2 authentication code to return HeatAPIException
    subclasses, so the API error response on auth failure is
    aligned with AWS responses.
    ref #125
    
    Change-Id: Iafa33e7aed4d77f2255b4d879192b9d15a2395aa
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/__init__.py  |   39 +++++++++++++++++++++++++++++++--------
 heat/api/v1/exception.py |   34 ++++++++++++++++++++++++++++++++++
 heat/common/wsgi.py      |   14 +++++++++-----
 3 files changed, 74 insertions(+), 13 deletions(-)

commit 637875f729538ac5cf294ce20fd37babd84587ff
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 21:51:55 2012 +0100

    heat : heat-boto remove boto.cfg reading
    
    Remove code directly reading boto.cfg, looks like the problem
    with boto not reading the config file internally is fixed upstream
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>
    
    Change-Id: I57e1d89d0fa83793d51d5cf6266c200d7abc7d57

 bin/heat-boto |   23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

commit 8bf7353982ea92ae950fd29dd61cb6a6b8d091b1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 14:33:19 2012 +0200

    Separate out formatting for Engine API from manager
    
    Change-Id: Ib5fc28bc6a3a2f1f3c0d291954e928d4fb036bbb
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/api.py                  |  264 +++++++++++++++++++++++++++++++++++
 heat/engine/manager.py              |  170 +++++-----------------
 heat/engine/parser.py               |   12 +-
 heat/tests/test_engine_api_utils.py |   94 +++++++++++++
 heat/tests/test_manager.py          |   94 -------------
 heat/tests/test_stacks.py           |   30 ++--
 6 files changed, 412 insertions(+), 252 deletions(-)

commit eb2790cc9968f3430f1e26bad917c5ca153ca806
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jul 6 15:07:46 2012 +0200

    Add new assertions about event unit tests
    
    Change-Id: I5a7d4690fe752c053a08ecfdb4f0467026fdd245
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_stacks.py |   42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

commit 4d79e24097aac5e1976240e9694a10ab92f0eccd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 6 16:57:48 2012 +1000

    Add basic autoscaling.
    
    This is mainly for ppetit so he can create multiple
    resources with one stack.
    
    Use like this:
    heat create lots -f ./templates/ppetit.template --parameters="KeyName=${USER}_key;NumInstances=2"
    
    Change-Id: Ie609a1843c855953d65183a8f2d8ed49254a265f
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/autoscaling.py                 |  148 ++++++++++++++++++++++++++++
 heat/engine/resource_types.py              |    3 +
 heat/engine/resources.py                   |    6 ++
 templates/HAProxy_Single_Instance.template |    2 -
 templates/ppetit.template                  |   57 +++++++++++
 5 files changed, 214 insertions(+), 2 deletions(-)

commit a0da17b39fc94269862d0113f254b966e133566c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jul 6 18:10:57 2012 +1000

    Add NovaSchedulerHints and correct the implementation of Tags
    
    Change-Id: Iaa7ea182414a8fc48a78f5aa6c2c3e1baddb4034
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/instance.py      |   15 ++++++++++++---
 heat/tests/test_resources.py |    8 ++++----
 heat/tests/test_stacks.py    |    4 ++--
 3 files changed, 18 insertions(+), 9 deletions(-)

commit fd83855600cf32f001f2004bd130bd948af9e51b
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 16:58:19 2012 +0100

    heat tools : openstack script don't create duplicate pv's
    
    Don't create duplicate loopback mounts if nova-volumes VG
    already exists
    
    Change-Id: I1c580f2915cd92709fbbf4033f77ec3c64e4952e
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/openstack |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit ed71fe29081c59d2ff73f27271aa909640a7b7aa
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 16:57:20 2012 +0100

    heat tools : openstack script add restart option
    
    Add option to restart openstack
    
    Change-Id: I7578ff4cecae5351d5749272424d71b56071239d
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/openstack |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 55d5713f19d81731903eac4e89020c58b37f4842
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 16:39:57 2012 +0100

    heat tools : whitespace cleanup in tools/openstack
    
    Convert mixed tabs/spaces to all spaces
    
    Change-Id: I3c75ead59afad8a7edf24d8fc6c1c0484dbcd3eb
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/openstack |  290 +++++++++++++++++++++++++++----------------------------
 1 file changed, 145 insertions(+), 145 deletions(-)

commit 80994c1f3924c3d786eaf509f8cb82b4bfac553c
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 14:42:53 2012 +0100

    heat tests : Add missing headers to tests
    
    Most of the tests lacked the apache licence boilerplate
    
    Change-Id: I34ed0066a6f6751fc872f5286acfc7550319bc8f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/tests/fakes.py              |   15 +++++++++++++++
 heat/tests/test_cfn.py           |   15 +++++++++++++++
 heat/tests/test_dependencies.py  |   15 +++++++++++++++
 heat/tests/test_manager.py       |   15 +++++++++++++++
 heat/tests/test_parser.py        |   15 +++++++++++++++
 heat/tests/test_resources.py     |   15 +++++++++++++++
 heat/tests/test_stacks.py        |   15 +++++++++++++++
 heat/tests/test_validate.py      |   15 +++++++++++++++
 heat/tests/test_waitcondition.py |   15 +++++++++++++++
 heat/tests/test_watch.py         |   15 +++++++++++++++
 heat/tests/utils.py              |   15 +++++++++++++++
 11 files changed, 165 insertions(+)

commit eb1166009065d293162ec0473102cba02a738e0f
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 14:15:37 2012 +0100

    heat API : cleanup docstrings
    
    Fix some API docstring formatting & content
    
    Change-Id: Iad1646bb91ae501110ee20a5820ffc5c168bcc45
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py |   52 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 14 deletions(-)

commit 5f812b65b72f75b09aa76d8a71b7f3966345710e
Merge: 767c418 c4cb6bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 5 16:53:06 2012 +0000

    Merge "Add more unit tests for the engine API"

commit 767c41850f0fe516f0553796b49cbb4b9f0b14ab
Merge: faba9b6 f71dc82
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 5 14:18:35 2012 +0000

    Merge "Pass Tags into scheduler_hints"

commit faba9b6d565f105d78dd13acba84ef775741f1e0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 5 23:44:05 2012 +1000

    Add monitoring to the loadbalancer
    
    This makes use of haproxy's unix socket api
    to get statistics. This is retrieved by cfn-push-stats
    and posted to the watch.
    
    Change-Id: I662293bf5dbc55e3f9106f7ef0ceb0641ddae564
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/loadbalancer.py |   63 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 50 insertions(+), 13 deletions(-)

commit 3b2e0727f958eda6b64eaa303bf798c62498951d
Merge: dfacb9f 9a8f083
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 5 13:17:35 2012 +0000

    Merge "heat tools : heat-db-drop prompt for missing password"

commit dfacb9f49b0651ac0d040d8e6d72b02e6a592ee3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 5 15:42:08 2012 +1000

    Add an OpenShift template.
    
    This is based off of http://www.krishnaraman.net/openshift-origin-on-openstack/
    
    This is the broker, the node is TODO (but simpler).
    
    Change-Id: I5d500a460e43de1172aa7636d9b94f590a979d97
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/OpenShift.template |  140 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)

commit f71dc82e140b7f7ce58469230eb8fe0b804f71ac
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jul 5 21:18:26 2012 +1000

    Pass Tags into scheduler_hints
    
    Change-Id: Idad6090c7baf0db943c999585dfe3bf33fc9492e
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/instance.py                    |   18 ++++++++++++++++--
 heat/tests/test_resources.py               |    4 ++--
 heat/tests/test_stacks.py                  |    2 +-
 templates/HAProxy_Single_Instance.template |    2 ++
 4 files changed, 21 insertions(+), 5 deletions(-)

commit 9a8f083276b35c68f3d57acfcb940b0c86e19220
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jul 5 10:46:53 2012 +0100

    heat tools : heat-db-drop prompt for missing password
    
    heat-db-drop fails to drop databases when called via
    tools/openstack erase, so prompt for password when
    not passed as a CLI argument.
    
    Change-Id: I4930b8457e0f3e1488187b35be9737578595c387
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 tools/heat-db-drop |    7 +++++++
 1 file changed, 7 insertions(+)

commit 9ce1d94553bd6341ac0416d1920be32506d7a94b
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jul 4 15:41:20 2012 +0100

    heat API : Convert API to use HeatAPIException subclasses
    
    Covert API to use HeatAPIException subclasses, instead of
    plain webob exceptions, which cannot be correctly serialized
    by the wsgi controller, and map engine errors to API exceptions
    so the raw engine exception is not propogated to the user.
    ref #125
    fixes #150
    
    Change-Id: I164c71e12ed29f40ad67188b645ca7ad2fa1fee8
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py |   54 +++++++++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 20 deletions(-)

commit 9de825c5d2395a420df8c66331d2ae2dcb351efd
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jul 4 11:45:38 2012 +0100

    heat API : Implement API specific exceptions
    
    Implement HeatAPIException and subclasses, which will return error
    responses serialized in the correct AWS API format when thrown
    ref #125
    
    Change-Id: I9039f181ee64ed59445667f50545dc6481973cb2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/exception.py |  192 ++++++++++++++++++++++++++++++++++++++++++++++
 heat/api/v1/stacks.py    |    1 -
 heat/common/wsgi.py      |   14 +++-
 3 files changed, 205 insertions(+), 2 deletions(-)

commit 9d0a22f92be29281718632d28a1cd06fd6219494
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 29 14:11:14 2012 +0100

    heat : add heat-boto test client
    
    Add initial version of the heat cli tool which uses boto
    - revised following review comments to remove jeos/cfn paths
    ref #92
    
    Change-Id: I61b5815b250f3b01d33844ff46dd1612000d51fd
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat-boto |  711 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 etc/boto.cfg  |   16 ++
 run_tests.sh  |    2 +-
 setup.py      |    1 +
 4 files changed, 729 insertions(+), 1 deletion(-)

commit c4cb6bd39590edb4a61f645209715f9577f61324
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jul 4 16:16:16 2012 +0200

    Add more unit tests for the engine API
    
    Verify the following endpoints:
     - list_stack_resources
     - describe_stack_resources
     - describe_stack_resource
    
    Additionally, check for presence of the correct output keys from the
    following endpoints:
     - list_stacks
     - show_stack
    
    Note that some tests are commented out because they are currently failing.
    This will be fixed in a future patch.
    
    Change-Id: I1c8c46283c1217789e3d4dea7aeac11c991bcef4
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_stacks.py |  199 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 188 insertions(+), 11 deletions(-)

commit 9c7c0dea6233e42bf5db3c7714b2bb7ce120f242
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 17:11:12 2012 +0200

    Store the context in the resources
    
    It's a pain to have to look it up in the stack every time
    
    Change-Id: I655260aafd17bc17b5895f5b53d79b20aa8eecbb
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/cloud_watch.py    |    4 ++--
 heat/engine/resources.py      |   16 ++++++++--------
 heat/engine/stack.py          |    4 ++--
 heat/engine/user.py           |    6 +++---
 heat/engine/wait_condition.py |    5 ++---
 5 files changed, 17 insertions(+), 18 deletions(-)

commit c68b2c53150adebff91d8df650f60e3c50ab63c9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 15:04:39 2012 +0200

    Add Metadata to detailed Resource output
    
    Change-Id: I492b9a0a190a905ca5c8597c7236ad1d130a5b77
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/wsgi.py    |   13 ++++++++-----
 heat/engine/manager.py |    2 ++
 2 files changed, 10 insertions(+), 5 deletions(-)

commit de02376d549ee22b4e1e37bd3e47ac6cb89cb9db
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 14:55:30 2012 +0200

    Use a consistent stack ID
    
    Generate the StackId field of various API responses in the same place, so
    it is consistent and can be easily modified later.
    
    Change-Id: I09a3e170b5825533d8cf9c7dbf08a0ef6700a682
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py |    8 ++++----
 heat/engine/parser.py  |    7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

commit 5b4a403f51a4099bd8651c8e92101c4f3e5f7e6f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 13:02:03 2012 +0200

    Make Stacks the owners of their own DB representation
    
    Change the way that Stack objects are initialised, so that they know how to
    load and store themselves in the database (they were already updating their
    own data, but the actual creation was being done externally). This
    consolidates a lot of existing Stack database creation code (in the
    manager, nested stacks and unit tests) into one place.
    
    Also, split the template and parameter handling out into separate classes,
    and pass these through the constructor for easier testing.
    
    Change-Id: I65bec175191713d0a4a6aa1d3d5442a1b64042f8
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py                 |  157 +++++-------
 heat/engine/parser.py                  |  429 +++++++++++++++++++++-----------
 heat/engine/stack.py                   |   39 +--
 heat/tests/functional/test_bin_heat.py |   12 +-
 heat/tests/test_parser.py              |  228 ++++++++++++++++-
 heat/tests/test_resources.py           |   13 +-
 heat/tests/test_stacks.py              |  177 +++++++------
 heat/tests/test_validate.py            |    8 +-
 heat/tests/test_waitcondition.py       |   30 +--
 9 files changed, 706 insertions(+), 387 deletions(-)

commit ce8f316fb5130641f948c177c4980bd8585f06b3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 12:41:40 2012 +0200

    Don't store the metadata server address in the Stack
    
    It is basically a global piece of data, so there is nothing to be gained by
    dragging some extra state around with us everywhere.
    
    Change-Id: I50ba7391f258dc7d9b1e186f1618fb140e15b26e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/instance.py       |   13 +++++++------
 heat/engine/manager.py        |    7 ++-----
 heat/engine/parser.py         |    4 +---
 heat/engine/resources.py      |    9 ++++++++-
 heat/engine/stack.py          |    3 +--
 heat/engine/wait_condition.py |    8 ++++----
 6 files changed, 23 insertions(+), 21 deletions(-)

commit 5f5f22f9b00dae1a2c649301bcdc463e12a22016
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 12:32:02 2012 +0200

    Delete user creds from DB when no longer required
    
    The user credentials are only for a particular stack and should be deleted
    when that stack is deleted.
    
    Fixes #162.
    
    Change-Id: Id5d1f101df17ede1843e4f2fca51903c956667ca
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/sqlalchemy/api.py    |    2 ++
 heat/db/sqlalchemy/models.py |    2 ++
 2 files changed, 4 insertions(+)

commit 0a6ac9895cd275662e8e38f610308565765ea17b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 14:03:47 2012 +0200

    Remove parsed template from database
    
    It is no longer used since we now store the parameters and can recreate the
    parsed template from the raw template.
    
    Change-Id: Id725bcde7b30ce33d122ccf9c6d5c571f7d754da
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/api.py                                     |   12 -----
 heat/db/sqlalchemy/api.py                          |   35 ++------------
 .../versions/009_remove_parsed_template.py         |   49 ++++++++++++++++++++
 heat/db/sqlalchemy/models.py                       |   16 -------
 heat/engine/manager.py                             |   15 ++----
 heat/engine/parser.py                              |   47 -------------------
 heat/engine/resources.py                           |    1 -
 heat/engine/stack.py                               |    7 +--
 heat/tests/test_stacks.py                          |   12 -----
 heat/tests/test_waitcondition.py                   |    5 --
 10 files changed, 57 insertions(+), 142 deletions(-)

commit efc611652efc8802f951552d4183e3cb15875ce3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 18:56:22 2012 +0200

    Make LoadBalancer a subclass of a nested stack
    
    This avoids duplicating the code for dealing with the nested stack
    instance.
    
    Change-Id: Iaeb96f6184cc39677be81bb5619c1fc3e3c9a2a2
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/loadbalancer.py |   66 +++----------------------------------------
 heat/engine/stack.py        |   14 ++++++---
 2 files changed, 14 insertions(+), 66 deletions(-)

commit ab2ee441df4f9f8273db146106b358bd2387c781
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jul 3 11:25:33 2012 +0200

    Use unittest assert*() methods instead of assert keyword
    
    This gives much more useful messages when something fails
    
    Change-Id: Ibdf22996e674beef6edabfd3f7ef7d2213b6f26c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/tests/test_resources.py     |    8 +++---
 heat/tests/test_stacks.py        |   55 +++++++++++++++++++++-----------------
 heat/tests/test_validate.py      |   10 +++----
 heat/tests/test_waitcondition.py |    8 +++---
 heat/tests/test_watch.py         |   22 +++++++--------
 5 files changed, 55 insertions(+), 48 deletions(-)

commit 82c61467a62b448e42874be0c2421762c0a6b1a3
Author: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date:   Wed Jul 4 13:27:45 2012 +0100

    Switch .gitreview to use OpenStack
    
    Change-Id: I47f98c5b68bffb0f547a1ca95e745dd2c4665dad

 .gitreview |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 894272f2140a8fceeb37fa6c0f09281f15f43c82
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jul 3 14:55:56 2012 +1000

    Add the loadbalancer resource.
    
    Some initial simplifications:
    - only one Listener
    - static (only use Instances)
    - only http (no tcp or ssl)
    
    Ref #164
    Change-Id: Iaac06eff83a5c43049adc95a98ebe632e17b490c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/loadbalancer.py          |  295 ++++++++++++++++++++++++++++++++++
 heat/engine/resource_types.py        |    2 +
 templates/WordPress_With_LB.template |   66 +++++---
 3 files changed, 340 insertions(+), 23 deletions(-)

commit 1439f85d72e420101289c02077bd0082b7079cde
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 2 13:10:59 2012 +1000

    Add the Fn::GetAZs() intrinsic function.
    
    This just returns 'nova' right now.
    
    Change-Id: I5449123b912da0f2aaca8a16aee78d391db033dd
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit 5faf344646d061710d57b452e395303fb25c55fb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jul 2 11:23:32 2012 +1000

    Teach CheckedSchema to do nested schemas
    
    Change-Id: Ie321fcded8c826ca98c15078d9a545f283d25510
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/checkeddict.py          |   14 +++++++++--
 heat/tests/unit/test_checkeddict.py |   44 +++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

commit 34c196f75b7598602902d2f125ee7d8b4232d697
Merge: 80b21e8 985ba43
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Mon Jul 2 18:16:21 2012 +0000

    Merge "Bump to v5"

commit 80b21e83bdc4fffeecdd580b20bb8e03fc5a5d09
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jul 2 14:04:33 2012 +0100

    heat API : Add missing Response wrappers
    
    It's not clear from the AWS API docs, but all responses
    should be wrapped in ActionNameResponse tags.
    ref #125
    
    Change-Id: I25f3860f30b7313ce63019e96d1da4e370552ed6
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py |   69 ++++++++++++++++++++-----------------------------
 1 file changed, 28 insertions(+), 41 deletions(-)

commit cd94c31909b98563663d9cf98b8c42a96c3ca188
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Jun 29 13:08:47 2012 +0100

    heat API : Make CreateStack work with boto
    
    Further API rework to make stack creation work via boto
    - Use webob.request.params not GET, as boto passes POST parameters in body
    - Wrap CreateStack response in CreateStackResponse as expected by boto
    - Add API debug for JSON format responses
    - (second version in stackforge due to long-line fix)
    ref #125
    
    Change-Id: I347368ee0395a9019fae69a06e45260379ed7722
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/__init__.py |    2 +-
 heat/api/v1/stacks.py   |    6 +++++-
 heat/common/wsgi.py     |   11 +++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

commit 4fe38c787e47def79cc820790529c3adeb383d27
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 29 10:52:41 2012 +0200

    Add unit tests for timeout extraction
    
    Change-Id: I87837b78dc04683aa686f0573bb7b643667c4553
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py     |    2 +-
 heat/tests/test_manager.py |   24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

commit b7eee6c64eb88a10b5a3e43985c8c05ceb3fa8ea
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 25 16:38:51 2012 +0100

    heat API : DescribeStacks return all when no stack name specified
    
    The AWS DescribeStacks API documentation says if no stack name specified,
    we should return results for all stacks created.
    fixes #142
    
    Change-Id: I3d17fef7f1b660bf399e8ff82ff39ca2b2d6f046
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat               |    4 +---
 heat/api/v1/stacks.py  |    9 +++++++-
 heat/engine/manager.py |   55 ++++++++++++++++++++++++++++++------------------
 3 files changed, 43 insertions(+), 25 deletions(-)

commit 8e5972a333e0e1e88d6d24a8951f0f0a0e216cab
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 29 10:22:21 2012 +0200

    Fix typo in stack creation code
    
    Broken by b942be0e362ef6c04afb45f0ecae8fa4ce432a20
    
    Change-Id: Iad6ace2d460212a41b8504d479335b9f16b5d5ce
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 237e838d4d6b9b8398d319fa08f1fb7ed4b65e17
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Jun 27 23:35:32 2012 -0400

    Change oz rpm install to use yum
    
    yum localinstall will automatically download needed dependencies.
    
    Change-Id: I0a24c549909ff50062affade014d3a17fc252e4d
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 docs/GettingStarted.rst |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit 73492540ddd009b6a0a3ed3f855bde38b05e1b0d
Merge: 9a800ac 2c15f8e
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Thu Jun 28 22:00:45 2012 +0000

    Merge changes I05dcfd9a,If938b51a,Iebd2693b
    
    * changes:
      Don't go fishing in the stack for the KeyName
      Tidy up create timeout code
      Get rid of _wrap_db_error()

commit 9a800aca5bbf59e44f3b8b222ae5713c44407c89
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 25 17:42:15 2012 +0100

    heat engine : Return timestamps formatted by heat_utils.strtime
    
    Fix remaining timestamps which are not formatted via heat_utils.strtime
    This allows event timestamps to be correctly parsed by boto.
    ref #125
    
    Change-Id: I62c3bdcdcfd8e1d51e6c3f2566eb1568e60097d2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/manager.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit ab3701968c8855fbe9b190e8f1a49f5526350287
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jun 28 13:01:12 2012 -0700

    Clean up pip-requires for stackforge
    
    Change-Id: I50a79fedf80269b8b1bad2c94d132d6692c8ecae
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/pip-requires |   31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

commit 63cdd18d5024e5f89e046463326cb40826a6f3c9
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jun 28 11:36:50 2012 -0700

    We don't need to be installable via PIP so remove build and install deps
    
    setup.py is installing dependencies via pip, making a mess of the system.
    
    Instead if someone wants to install, expect they will have openstack
    installed already, which should contain the necessary dependencies.
    
    Change-Id: I8ff82aad1b85bd4e1acc454b04c5fcec2adcadbe
    Signed-off-by: Steven Dake <sdake@redhat.com>

 setup.py |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

commit 2c15f8e1b3c0a4d05efa7a37f28ad49db22569d4
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jun 27 11:47:30 2012 +0200

    Don't go fishing in the stack for the KeyName
    
    The KeyName should be a property of the Instance, and need not have the
    same name in the stack parameters.
    
    Change-Id: I05dcfd9aa6f92bc7aaa2dbc594062984ac074b7e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/instance.py     |   17 ++++++++++-------
 heat/tests/test_validate.py |    6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

commit b942be0e362ef6c04afb45f0ecae8fa4ce432a20
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 26 11:36:10 2012 +0200

    Tidy up create timeout code
    
    - Change the parameter name to 'TimeoutInMinutes' to match CloudFormation
    - Don't hack parameters into the template, just pass them as parameters
    
    Change-Id: If938b51a0fcb36bb76efeea3527ee7f8eaae9f81
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat                |    2 +-
 heat/api/v1/stacks.py   |    3 ---
 heat/cloudformations.py |    2 +-
 heat/engine/manager.py  |   18 +++++++++++++++---
 heat/engine/parser.py   |   24 ++++++++----------------
 5 files changed, 25 insertions(+), 24 deletions(-)

commit 4bff543367b5283037b21da1b1de34a90e572343
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 25 15:03:17 2012 +0200

    Get rid of _wrap_db_error()
    
    This was causing recursion depth errors, and the exceptions in question are
    never being specifically caught anywhere anyway.
    
    Fixes #137
    
    Change-Id: Iebd2693bb1418392ebb041fbbb788bef28aae581
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/sqlalchemy/session.py |   29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

commit 985ba43a24c579b0f0be342aa1526cda919a7cc7
Author: Ian Main <imain@redhat.com>
Date:   Wed Jun 27 09:56:54 2012 -0700

    Bump to v5
    
    Heat version 4 is now released, on to version 5.
    
    Change-Id: I6e679f0d202e25bcaa0620b2a858a2910f4d4f33
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 038a65947c8a6fdb13328c6555ba148330a0a7cc
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 27 15:20:45 2012 +1000

    Store the user parameters in the stack table
    
    This allows us to use the raw template + the parameters
    in place of the parsed_template.
    Using the parsed template we lose the dependancy information
    that is necessary when deleting the stack.
    
    Change-Id: Icc6ed9ae1617ea9f760a674b44630918669124f9
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../migrate_repo/versions/008_user_parameters.py   |   16 ++++++++++++++++
 heat/db/sqlalchemy/models.py                       |    1 +
 heat/engine/manager.py                             |    9 +++++----
 3 files changed, 22 insertions(+), 4 deletions(-)

commit a2fc69d90556301334d454e434ca95b7f18b34d4
Merge: 0b6d912 63c81a2
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Tue Jun 26 16:22:36 2012 +0000

    Merge "Do not remove qpid-cpp-server as it is part of openstack erase"

commit 0b6d912a97cd1c609573638f8bc838c313ba01cd
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue Jun 26 16:41:17 2012 +0100

    heat GettingStarted guide, add oz install instructions
    
    Add F16/F17 install instructions for oz install
    Amended following sdake review comments
    
    Change-Id: I58830edd1581279ac987626b3fb4d7cc51fe455a
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 docs/GettingStarted.rst |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit f557b22e7e8fc7d3200f538e782dc1d00f56bed2
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 26 23:23:27 2012 +1000

    Add nested templates that implement a simple proxy/loadbalancer
    
    Change-Id: I49f12e399f565d77955cf26288d182d0165422a0
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/HAProxy_Single_Instance.template |   94 ++++++++++++++++++
 templates/MySQL_Single_Instance.template   |   37 ++++++-
 templates/WordPress_And_Http.template      |  135 +++++++++++++++++++++++++
 templates/WordPress_With_LB.template       |  148 ++++++++++++++++++++++++++++
 4 files changed, 410 insertions(+), 4 deletions(-)

commit 8623ba8dbd5707b6d73f081556f94ec64b299ca5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 26 18:57:54 2012 +1000

    Pass the stack_id into the resource_metadata_update
    
    Change-Id: I2b98592cf3970e3cd79ae7002504fb34cf2d42cd
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py           |   14 +++++---------
 heat/engine/wait_condition.py    |    2 +-
 heat/metadata/api/v1/__init__.py |    2 +-
 heat/metadata/api/v1/metadata.py |   12 ++++++------
 4 files changed, 13 insertions(+), 17 deletions(-)

commit 63c81a2d87588bb2fdedc885ab9a90a1af9e6a62
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Jun 25 23:11:51 2012 -0700

    Do not remove qpid-cpp-server as it is part of openstack erase
    
    qpid-cpp-server is not a core part of openstack proper
    
    Change-Id: I448b19669c11c839c22b0c012d316b7b7bc75a69
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1a43f5e6098ba5457a15fd9a2c29ecab4068dfa3
Author: Ian Main <imain@redhat.com>
Date:   Mon Jun 25 21:06:02 2012 -0700

    Few small fixes for getting started.
    
    A few small updates to the documentation and to the openstack install
    script to make it work more smoothly from a base install.
    
    Change-Id: Id9abad058695474aefcae62a5d7a1babc98d0ec9
    Signed-off-by: Ian Main <imain@redhat.com>

 docs/GettingStarted.rst |    4 ++--
 tools/openstack         |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 29ffcfb0b7e4102527d1937b7f5385e729b910c9
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jun 25 18:04:25 2012 -0400

    Remove --root=/ in install script
    
    Installing with --root=/ put the files outside of the egg directory,
    which is not desired.
    
    Change-Id: I40142d1a67c0ee12814e08e7b2846bee0ce4e32e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 install.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d48c537760b9de80a48f51f41d5192814893e390
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jun 25 12:47:23 2012 -0400

    Add keystone create script for devstack
    
    Copied from heat-keystone-service, with two differences:
    The keystone endpoint-create command has been deleted. Devstack uses the
    templated catalog driver by default, which does not support this
    command. (The equivalent operation is handled manually elsewhere.)
    
    keystone user-role-add parameters have slightly different names,
    requiring _id suffixes.
    
    Change-Id: I3d56becde7b6fedbe29e1cfc6a2b4ad9ab2621fa
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 tools/heat-keystone-service-devstack |   52 ++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

commit 34f1bb34a50094bfc13034a03e364017ee2e1151
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 25 14:15:51 2012 +0100

    heat API : Align DescribeStacks response with AWS docs
    
    Reformat the DescribeStacks response to more closely align
    with the AWS API spec - boto parses the result correctly with
    these changes.  Ref #125
    
    Change-Id: I23b270c040653f404014807de79c85b2ab63c85f
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py  |    6 ++++++
 heat/engine/manager.py |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

commit d2487050b6e16d9bbb40d5f842793c44780635ec
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 25 10:16:06 2012 +0100

    heat API : Escape JSON TemplateBody XML serialization
    
    AWS API defines JSON templates returned inside XML "wrapper"
    this change escapes XML serialization of TemplateBody content
    ref #152
    
    Change-Id: I7e38dd2010b03061979f0906b582f9461c85cabc
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/common/wsgi.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit e09bd8e662fbd3b1de88759998cb305c49c76b04
Merge: 85fe316 6603aa2
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Sun Jun 24 04:27:46 2012 +0000

    Merge "Add uninstall script for Heat"

commit 85fe316bcde7e185cf98a073df912ded0cefdb08
Merge: e0c3141 893cda4
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Sun Jun 24 04:25:38 2012 +0000

    Merge "Fix path to cloudinit directory"

commit 6603aa27fed8540dfade5e8541d2e1203f5afebe
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Sat Jun 23 22:41:30 2012 -0400

    Add uninstall script for Heat
    
    Change-Id: I1f0cbde19f5b75106d93cafdbd0b8fbf47cbbfe0
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 uninstall.sh |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit e0c314125318b5d1c2120fa23ddc03f09e91dc36
Author: Ian Main <imain@redhat.com>
Date:   Fri Jun 22 08:48:23 2012 -0700

    Factor out authenticate method for engine.
    
    This patch factors out an authenticate() function for use by both
    the heat service authentication and the resource authentication.
    This fixes the AWS auth method for creating resources - issue #153.
    
    Change-Id: I134e993263ae6ba4890f56bfbe6a6a3205b7f921
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/auth.py         |   81 +++++++++++++++++++++++++++++++++++++++++++
 heat/engine/manager.py      |   77 +++++++---------------------------------
 heat/engine/resources.py    |   11 +++---
 heat/tests/test_stacks.py   |    5 +--
 heat/tests/test_validate.py |   25 ++++++-------
 5 files changed, 113 insertions(+), 86 deletions(-)

commit 38d382ad07168ff7e521b574b46a13b9f67bf941
Author: Ian Main <imain@redhat.com>
Date:   Fri Jun 22 09:55:17 2012 -0700

    Fix metadata startup.
    
    A previous change to wsgi init caused the metadata to break.  This
    makes the 4th argument to init optional allowing other wsgi apps to
    continue to work as normal.
    
    Change-Id: Ib0e7042f656a9319013dba4e30c7ffa35cb85f92
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/common/wsgi.py |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

commit f87fb58e01d24f85c7b5c710f1eefdeb1932f3d4
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Jun 22 12:26:38 2012 -0400

    Change install.sh to work on fresh install
    
    Also, change shell to allow use of bash on Debian.
    
    Change-Id: I53b038432389c824556d90ea686c28d132708904
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 install.sh |   32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

commit 893cda431447a319809e2dd9f4ebd41ea012997b
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 22 17:30:28 2012 +0200

    Fix path to cloudinit directory
    
    The various path manipulations designed to search for the cloudinit
    directory do not work with the current installation script, or when
    heat-jeos is also installed. They also perform gratuitous manipulation of
    sys.path (causing warning messages) and may pick up the cloudinit files
    from a different location to the code that is actually running. Python
    already knows which heat package we are using - just look for the directory
    inside there.
    
    This patch also tidies up the code for generating the user data.
    
    Change-Id: I14add5f1670aea2562329ff1a1303320a35ff428
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/instance.py |   67 ++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 41 deletions(-)

commit fa7d89e5eda5fc5ad617cd19b9be3c7277692ab4
Merge: 60c6bb5 b2ab263
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Fri Jun 22 11:05:24 2012 +0000

    Merge "heat API : Add support for ContentType=JSON query parameter"

commit 60c6bb5319e167413c640f472bacd989b44f6882
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 22 14:41:20 2012 +1000

    Ignore the unimplemented properties of IAM::User
    
    They are in lots of templates, and this is going to get
    irritating fast.
    
    Change-Id: I42cb5e5d0e8496028a70d6bed8477a0c864a09e7
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/user.py |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

commit 0d9052ef4f708c34aafa3bb3ebcd126d76db9db1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 22 14:11:01 2012 +1000

    Don't use json.dumps() on the output of get_template
    
    Change-Id: I913e9f9e2b90cd983fb9674b18b6c81d66129e6c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2eadedf5fde33886ad46f5c8ae958ddb40eaefdd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 22 12:01:55 2012 +1000

    Fix EIP template.
    
    Some of the implemented flags were wrong.
    Allow the eip to be deleted when no eip was created.
    
    Change-Id: Id1d3aaff9adf0988a5c58f8bf0f7b2fb9c7bde44
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/eip.py            |    9 +++++++--
 heat/engine/instance.py       |    3 +--
 heat/engine/security_group.py |    6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

commit e30ee55ff99db36af97f18716e19a521c36c3543
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jun 21 15:05:00 2012 -0700

    Remove service name from nova() def
    
    The service_name field is not unique between distros or versions of
    openstack, but is used to select endpoints for communication with nova
    and volume services.  The nova client will sort out the correct operation
    based upon the service_type field.
    
    The service_name field should probably just be removed from the API
    definition upstream.
    
    Tested on F16 & Devstack U12.
    
    Change-Id: I36409dba9d9ec2b453a027fc1e2e78f7c8ace2a2
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

commit b2ab26398ffa1232e84cc0c78217cad644eaae30
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jun 21 10:52:25 2012 +0100

    heat API : Add support for ContentType=JSON query parameter
    
    From reading the boto code, and looking at real AWS API responses
    it would appear there is an (undocumented?) AWS query parameter
    which switches response format from XML (default) to JSON
    ref #125
    
    Change-Id: I7c8b0f5701be5ff8bd0a3b135e42cf0e46e39ded
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py |    3 +--
 heat/common/wsgi.py   |   21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

commit acf8334a1f370975c18109bf59452b09721ce1c1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 21 15:20:16 2012 +0200

    Fix Stack initialisation
    
    self.parms must be set before calling self.resolve_static_data()
    
    Change-Id: Ic3864c56575d759f4f398eb55f90e12c2afdd5f6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parser.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 89dca2fd6a6696ccc04ceae602f6ab8673f38e97
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jun 21 14:03:19 2012 +0100

    heat templates : Cleanup README and template whitespace
    
    Align README with latest templates and cleanup some whitespace issues
    ref #147
    
    Change-Id: Iad39c388806bba6497f8abf0de46c04ef7ac7e69
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 templates/PuppetMaster_Single_Instance.template    |   29 +++++++------
 templates/README                                   |   43 ++++++++++++++++++--
 templates/Rails_Single_Instance.template           |   12 +++---
 .../WordPress_Single_Instance_puppet.template      |   18 ++++----
 templates/getting_started.template                 |    5 +--
 5 files changed, 71 insertions(+), 36 deletions(-)

commit c44746d8d500825211b53cfdc54ee8ea73fb639d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 21 20:10:53 2012 +1000

    Fix the wait condition's reading of the metadata.
    
    the db was caching the object, so we need to 'expire'
    it to make sure we are getting live data.
    
    Change-Id: I1108daccc96f3dcfa33fda968ea30d83e03aad2d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/db/sqlalchemy/models.py     |   16 ++++++
 heat/engine/manager.py           |    1 +
 heat/engine/wait_condition.py    |   22 +++++---
 heat/tests/test_waitcondition.py |  108 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 140 insertions(+), 7 deletions(-)

commit 477baee868a990ae5b4733c08668f382aa156481
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 21 14:36:19 2012 +1000

    Fix a typo (from the commit to use state instead of parsed_template)
    
    Change-Id: I37800ad3fb50210b8f27ca889fcfa48e14da8af0
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c20b33dd1448c1a0b9d8d3141a9fa299d3268f69
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 21 14:54:38 2012 +1000

    Use the correct resource name
    
    Change-Id: I25d6962dfcc75b703aae6489cd0e751317029bc6
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/wait_condition.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 970c333d4e13685f025c4dc27ae7df9807d6c309
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Jun 19 14:54:27 2012 +0200

    Make the describe-resource API calls user-aware
    
    Fixes #143
    
    The stack retrieval DB calls were already fixed in previous commits but
    there was still one query (resource_get_by_physical_resource_id) that
    would return any resource, not just the ones owned the user.
    
    Change-Id: Ie02ff1e8ba6ea8da2c3d0c7f0a87c32452824fc6

 heat/db/sqlalchemy/api.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit d5d13120e44c2f4debec7dabd0cc5e43e41ba11a
Merge: 66fb205 6e6d0b4
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Wed Jun 20 15:24:37 2012 +0000

    Merge "Don't remove resources from the DB during HA restart"

commit 66fb2054fb67dc17d5b6f558ffefe38706d2e1aa
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 23:49:26 2012 +1000

    DB: add stack status & reason, resource metadata
    
    Change-Id: I369aa688fa9890a5484de417a9995e7f04f34ad2
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../migrate_repo/versions/007_resource_work.py     |   32 +++++++++++++++++++
 heat/db/sqlalchemy/models.py                       |    4 +++
 heat/engine/manager.py                             |   33 +++++++-------------
 heat/engine/parser.py                              |   14 +++++++--
 heat/engine/resources.py                           |   12 ++++---
 heat/engine/wait_condition.py                      |   24 ++++++++------
 heat/tests/test_stacks.py                          |    2 +-
 7 files changed, 82 insertions(+), 39 deletions(-)

commit b85bdc2d6c958a76ef0e274e1cf74ce1a4bb2e07
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 22:21:24 2012 +1000

    Use the resource.state_description
    
    Change-Id: I114067f3bb91c6d38b3c4c69af842f4f3585810b
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py   |    1 +
 heat/engine/resources.py |    1 +
 2 files changed, 2 insertions(+)

commit 6e6d0b42225aee8e5eb351e66ae07363099ff38d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Jun 20 13:58:26 2012 +0200

    Don't remove resources from the DB during HA restart
    
    This was broken by 3b91d100a6c6424961e1ec06cf7afd9a1c9cf49c. Resources
    should be removed from the DB only when the stack is deleted.
    
    Change-Id: I6822aee8453afd6076793cff9206a035cff33588
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parser.py    |    2 +-
 heat/engine/resources.py |   31 +++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

commit 1530a29cfd25e33b50e5894fbe47dcd235bb3fef
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 21:24:44 2012 +1000

    Make the saving cfn-signaling more reliable
    
    1) The metadata saved in manager.py was not always showing up
       in the db (from wait_condition.py)
    2) Reuse a little method in parser.py to retrieve the parsed_template
       db entry (and store the parsed_template_id).
    
    Change-Id: Ib5b5474b81c0b7439eb1fa4aec5a0f1f21bbde1c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py        |    3 +--
 heat/engine/parser.py         |   24 ++++++++++++++++--------
 heat/engine/wait_condition.py |   18 ++++++++----------
 3 files changed, 25 insertions(+), 20 deletions(-)

commit cfd1232038286fb14b36d1427d4ce5f7611ba58f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 14:01:29 2012 +1000

    Remove duplicate setup_logging()
    
    This is already done in load_paste_app()
    
    Fixes #146
    
    Change-Id: I3631b7ade06c8b142960abbf9c172461fae93a56
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat-api      |    1 -
 bin/heat-metadata |    1 -
 2 files changed, 2 deletions(-)

commit bb92e62581a5241a581af9b243615839ebafa685
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 12:23:55 2012 +1000

    Work around keystone strangeness (error deleting user)
    
    Fixes: #144
    
    Change-Id: Ib9298605accc3fc7d12112a4fb57df2b4746864a
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/user.py |   30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

commit 3df9355a68ad42b04448b62a4197b8ee63b03ac3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 20 09:37:23 2012 +1000

    Fix db exception description
    
    Change-Id: Ie7c1076e9cf5be1d6d63d3af7bc90933c1e588f7
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6ad3c5c3ea8e4bcbffabc386cb85e5d0cf5daba5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 19 16:04:52 2012 +1000

    Fix the metadata rpc functions
    
    Change-Id: Id3a071a45037d85920d273fa198d59602443026d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit f2784dbfba83a44500094b8fb6a85fa4ef7f1ac0
Merge: b40d770 a4090bf
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Mon Jun 18 17:34:50 2012 +0000

    Merge "heat API : Align response StackId with AWS spec"

commit a4090bfb12e86dac68331ddeb15b1b4a3a3fab38
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 18 17:49:31 2012 +0100

    heat API : Align response StackId with AWS spec
    
    Revise response format for CreateStack, ListStacks and DescribeStacks
    so the StackId element is formatted in a similar way to the AWS spec
    
    Change-Id: I0dd34a6dae2e30c63619449ebbf89643ccc9d364
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py  |   17 ++++++++++++++---
 heat/engine/manager.py |    7 +++----
 2 files changed, 17 insertions(+), 7 deletions(-)

commit b40d770864e0d7ee8923f77a82c2145d84a07c42
Author: Ian Main <imain@redhat.com>
Date:   Mon Jun 18 09:47:34 2012 -0700

    Add more per-user stack support (2).
    
    This finishes up the API calls with per-user returns of stacks and
    events.
    
    Change-Id: Iab6118f35978a6f62ad4d3454842cb7f3d686bc8
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/db/api.py            |    4 ++++
 heat/db/sqlalchemy/api.py |   11 +++++++++++
 heat/engine/manager.py    |    4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

commit d09bad5bef0179bfb0b0d95787da21dea0e6081c
Merge: f6e69f8 0846b4d
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Mon Jun 18 16:30:56 2012 +0000

    Merge "Add execute bits to executable scripts manage.py and runner.py"

commit f6e69f8419b342a3cadb8dd3522d22fdd8905977
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 18 17:48:54 2012 +0200

    Add example templates for nested stacks
    
    Change-Id: I3b5fb7018a606895007dad589f1dcbeb6b0defe6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 templates/MySQL_Single_Instance.template        |  136 ++++++++++++++++++++
 templates/README                                |    7 ++
 templates/WordPress_Composed_Instances.template |  152 +++++++++++++++++++++++
 3 files changed, 295 insertions(+)

commit 0846b4dd1b7696f6db5850fce6c6ab0f563643ca
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Jun 18 09:13:25 2012 -0700

    Add execute bits to executable scripts manage.py and runner.py
    
    Fixes issue #138.
    
    Change-Id: I90b139dac5775cb061bed79e86e1ded99b9322ca
    Signed-off-by: Steven Dake <sdake@redhat.com>

 0 files changed

commit 9a19032ff8dc3804150461dae926ca75db1288d6
Merge: 7155c52 f13727e
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Mon Jun 18 16:00:53 2012 +0000

    Merge "Add manpage for heat-metadata"

commit 7155c52d9481fe98decb78769667cb9ba6874479
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon Jun 18 15:15:50 2012 +0200

    Fix DB calls in Resource API
    
    The DB API changed in 892b99bff480aba8240a1f49eadeea079bae4c81, while
    these calls were added in 247cc2bb9afb9db87ffad7160ef05d2cc4457235. Both
    patches were under review simultaneously.
    
    Change-Id: I8fc6c3228c99f025e01fc82979fa94f086649909
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 247cc2bb9afb9db87ffad7160ef05d2cc4457235
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Jun 14 17:51:45 2012 +0200

    Add describe resource API calls
    
    Fixes #62.
    
    This commit implements the `DescribeStackResource`,
    `DescribeStackResources` and `ListStackResources` AWS API calls.
    
    Change-Id: Id9161b3c3eb527d5936c5b8978e32a67ba6c12bb

 bin/heat                  |   68 +++++++++++++++++++++++++++++++++
 heat/api/v1/__init__.py   |    3 ++
 heat/api/v1/stacks.py     |   92 +++++++++++++++++++++++++++++++++++++++++++++
 heat/client.py            |    9 +++++
 heat/cloudformations.py   |    4 +-
 heat/db/api.py            |    5 +++
 heat/db/sqlalchemy/api.py |    7 ++++
 heat/engine/manager.py    |   81 +++++++++++++++++++++++++++++++++++++++
 8 files changed, 268 insertions(+), 1 deletion(-)

commit 614f7868c43b57eee658a0eb5f82281ffe62b2af
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon Jun 18 11:30:50 2012 +0100

    heat api/engine : Reworked approach to aligning with AWS date format
    
    Modifies heat internal default date-string representation to match AWS spec
    Note heat.common.utils.strtime default format loses sub-second precision
    Avoids having to regex mangle datetime string format
    ref #125
    
    Change-Id: I1347e82b1c3ccac5eac7c85858cf8009723547c2
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py  |   11 -----------
 heat/common/utils.py   |    2 +-
 heat/engine/manager.py |    9 +++++----
 3 files changed, 6 insertions(+), 16 deletions(-)

commit f7f4755076c29931e4ed372448487068d9462f15
Author: Steven Hardy <shardy@redhat.com>
Date:   Sat Jun 16 08:39:10 2012 +0100

    heat API : Align time format with AWS spec
    
    - Reformat ListStacks/DescribeStacks responses to align time format with AWS spec
    - Remove duplicate member tags in DescribeStacks (now handled by XMLResponseSerializer)
    ref #125
    
    Change-Id: Ib001acba591dba52f3f56052427d2b298d781ea0
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/stacks.py |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

commit 88c8bdee3f650411f5b46c87c7c45b9e76360cd8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 18 15:10:30 2012 +1000

    Lengthen the timeout of the WaitCondition in the HA template
    
    Change-Id: I059075b80dfac0472ae2e2e47d14b2ee4093a530
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_Single_Instance_With_HA.template     |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit be76361dea8eeabbdeedc12338d772ca7b94972e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 18 15:09:48 2012 +1000

    Change create_watch_data from POST to PUT
    
    Change-Id: Ie460e76668fdbc3101da183e373d02eefda945f3
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/metadata/api/v1/__init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a9f0c446bc48870d6f1e51739cf5519ebb19ba05
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 18 15:09:08 2012 +1000

    Get the context from the db not the context of the guest tool
    
    Change-Id: Ia2403161a0f97eb1c807be339d8024ff5c245695
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 6044ef1b78678916611764ba023f3514ab447d14
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jun 17 16:05:58 2012 +0200

    Implement Nested Stacks
    
    Fixes #123.
    
    Change-Id: I89affe471b4df898c7d3157ff23f9b64003c2893
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/sqlalchemy/api.py                          |    9 +-
 .../migrate_repo/versions/006_nested_stacks.py     |   23 ++++
 heat/db/sqlalchemy/models.py                       |    7 +-
 heat/engine/checkeddict.py                         |    5 +
 heat/engine/parser.py                              |   16 +--
 heat/engine/resource_types.py                      |    2 +
 heat/engine/stack.py                               |  117 ++++++++++++++++++++
 7 files changed, 165 insertions(+), 14 deletions(-)

commit 582b8b29cb443410ee87f8518e648aefdc42014f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jun 17 16:05:57 2012 +0200

    Move parsing of parameters out of template parser
    
    The format of the params received by the manager is a property of the Heat
    API protocol, not of the template, so it makes sense not to have the parser
    extracting the template parameter data from them. This simplifies the
    implementation of #123 (Nested Stacks).
    
    Change-Id: I8eaf50caf79f69359cbc8ee1f0193c08d7944d1c
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py       |   35 ++++++++++++++++++++++-----
 heat/engine/parser.py        |   15 +-----------
 heat/tests/test_manager.py   |   55 ++++++++++++++++++++++++++++++++++++++++++
 heat/tests/test_resources.py |    8 ++----
 4 files changed, 87 insertions(+), 26 deletions(-)

commit 892b99bff480aba8240a1f49eadeea079bae4c81
Author: Zane Bitter <zbitter@redhat.com>
Date:   Sun Jun 17 16:05:57 2012 +0200

    Get stacks from the DB by either name or id
    
    This code was previously misleading, as it appeared to get stacks by id,
    but actually got them by name. This patch adds a separate API, so
    get_stack() gets the stack by id and get_stack_by_name() gets it by name.
    
    Change-Id: I1cbbb3f9211661ad665e208d87298f177825f8ac
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/api.py            |    8 ++++++--
 heat/db/sqlalchemy/api.py |   21 +++++++++++++++------
 heat/engine/manager.py    |   20 ++++++++++----------
 heat/engine/parser.py     |    6 +++---
 4 files changed, 34 insertions(+), 21 deletions(-)

commit 42ad6a7a652aed6b154b85dfcf818324dd627ea7
Merge: da698d0 be0d7bf
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Fri Jun 15 22:44:08 2012 +0000

    Merge "Fix latest DB migration script"

commit da698d0bd28fbaae55666af56f47972074f71aed
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Jun 15 08:39:02 2012 -0700

    Lock to pep 1.1
    
    Change-Id: Ic363e8815c057219b2a7ba9dfc149d47378283e6
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/test-requires |    8 ++++----
 tox.ini             |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

commit be0d7bf844c6a4b6b594e83f1e7a6d0a2d73826f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 15 16:19:08 2012 +0200

    Fix latest DB migration script
    
    Unfortunately, as long as the user_creds_id column is not nullable the
    script will still fail if there is data in the database. However with this
    patch it is at least left in a recoverable state. Also, downgrades now
    work.
    
    Change-Id: Ibb7b7664ad2532154fab90a50bbb95ae9ccfbb91
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 .../migrate_repo/versions/005_user_creds.py        |   31 +++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)

commit f8fbbd07265763b2df4903133e1f73b049b6834d
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 12 16:23:35 2012 +0200

    Raise NotFound exceptions from database
    
    Raise a specific exception (NotFound) if something is not found in the
    database. Then we can match on this exception, rather than searching the
    error message (which effectively makes the text of error messages part of
    the API).
    
    Change-Id: I22673ffb1407cf95b1fe24eaec8824039c1dda4e
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/sqlalchemy/api.py  |   19 ++++++++++---------
 heat/engine/cloud_watch.py |    2 +-
 heat/engine/resources.py   |   14 ++++++--------
 3 files changed, 17 insertions(+), 18 deletions(-)

commit 3b91d100a6c6424961e1ec06cf7afd9a1c9cf49c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 5 09:46:10 2012 +0200

    Tidy up Resource creation and deletion
    
    Most of this code is common between resources, so put it in the parent
    Resource class and have subclasses provide handle_create()/handle_delete()
    methods for all their extra needs.
    
    Change-Id: I14c6afa9fdd1ecc065036fa93bde2a693b6c3eb2
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/cloud_watch.py    |   23 +-----
 heat/engine/eip.py            |   37 +---------
 heat/engine/instance.py       |   70 ++++++------------
 heat/engine/manager.py        |    8 +-
 heat/engine/parser.py         |  134 ++++++++++++++--------------------
 heat/engine/resources.py      |  161 +++++++++++++++++++++++++++--------------
 heat/engine/security_group.py |   24 +-----
 heat/engine/user.py           |   35 +--------
 heat/engine/volume.py         |   47 +-----------
 heat/engine/wait_condition.py |   40 +---------
 heat/tests/test_stacks.py     |   15 ++--
 11 files changed, 214 insertions(+), 380 deletions(-)

commit 067e037064b3e10f5ede335ac2688fbb4a2f7b01
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu Jun 14 11:08:51 2012 +0200

    Do proper dependency calculations
    
    Change-Id: Ic8a9bd2105ebfff3604a45b45eac39da3b1bbcf5
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/cloud_watch.py      |    5 +-
 heat/engine/dependencies.py     |  201 +++++++++++++++++++++++++++++++++++++++
 heat/engine/manager.py          |    4 +-
 heat/engine/parser.py           |  176 ++++++++++++++--------------------
 heat/engine/resources.py        |   38 +++++---
 heat/tests/test_dependencies.py |  186 ++++++++++++++++++++++++++++++++++++
 6 files changed, 491 insertions(+), 119 deletions(-)

commit f74219a52d1d9b0c367409c46c7c64e48cf24464
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu Jun 14 19:22:44 2012 +0100

    heat manager : rename dict keys to align with AWS API
    
    Rework to align API response format with AWS API XML key naming,
    ref #125
    
    Change-Id: Ifa0d1b87d0b721e71c50be06815a7aaf12b07bb3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/engine/manager.py    |   30 +++++++++++++++---------------
 heat/tests/test_stacks.py |   10 +++++-----
 2 files changed, 20 insertions(+), 20 deletions(-)

commit 8e95a0f2117b35e6326c0c32ee7bb2818f77e1c7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 15 15:51:28 2012 +1000

    Add a better error message
    
    This was "ERROR" in the event status description.
    
    Change-Id: I401bbbe1c8e8cafe64a692b7faba63bd2ab38a4c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/instance.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit b637eef5af14896a58cc33c8bf880066b3a796d4
Author: Ian Main <imain@redhat.com>
Date:   Thu Jun 14 17:46:12 2012 -0700

    Add a user creds database table and associate stacks with username.
    
    This patch takes the credentials passed in from the context and allows
    you to store them in the database in the 'user_creds' table for later
    use with HA operations.  It also adds a 'username' to the stack table
    for direct comparison and user validation to support per-user stacks.
    
    Thanks to Angus for fixing the tests for me :)
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/db/api.py                                     |   12 ++++
 heat/db/sqlalchemy/api.py                          |   23 +++++++
 .../migrate_repo/versions/005_user_creds.py        |   68 ++++++++++++++++++++
 heat/db/sqlalchemy/models.py                       |   23 +++++++
 heat/engine/manager.py                             |   10 ++-
 heat/tests/test_stacks.py                          |   33 ++++++++--
 6 files changed, 160 insertions(+), 9 deletions(-)

commit d36d8d38ba3d9b440a385f519f19bda6c3416547
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 15 10:55:51 2012 +1000

    Fix the metadata server auth (KeystoneCreds only sent from heat)
    
    Change-Id: I918ff76485649ec56312f7029895d61e0cbf7a4b
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/common/context.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit f45d43626385c15246e55212a0093ae03695e203
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 15 09:49:46 2012 +1000

    Fix the error reporting.
    
    - Don't return a dict error
    - in manager return full response
    - return the result in Resource.validate()
    
    Change-Id: I585ea9dd9cf747927fb4effb90cfff49cba20931
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/checkeddict.py |    6 ++----
 heat/engine/manager.py     |    2 +-
 heat/engine/parser.py      |    2 +-
 heat/engine/resources.py   |    4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

commit f13727e22d7feb2f485a96a9884ce973e5e3aabb
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Jun 11 18:19:10 2012 +0200

    Add manpage for heat-metadata
    
    Fixes #140
    
    Change-Id: Iafedefbf2e564760f560ca5f44a44b0cb943fede
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 docs/man/man1/heat-metadata.1 |   45 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

commit 1fc9ff4a0b0acc8c68e14f617ede4b4640ba00b1
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Jun 13 15:45:46 2012 +0100

    heat API : return response body as XML not JSON
    
    AWS API returns response as XML, this implements a new response serializer which
    turns dicts returned from the engine into AWS style XML responses.  Ref #125.
    Updated following review comment.
    
    Change-Id: I8170ed814be0b5cea98761a2723e12be216374a3
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat              |   14 +++++++-------
 heat/api/v1/stacks.py |    2 +-
 heat/client.py        |    5 +++--
 heat/common/wsgi.py   |   31 +++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 10 deletions(-)

commit fd1c6c8010ba12a48864ab76808ae0e5247415d2
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Jun 13 12:50:01 2012 -0700

    Add heat-db-setup.1 manual page
    
    Change-Id: I80650931fd9d5de902e37458766d6938f6466bb3
    Signed-off-by: Steven Dake <sdake@redhat.com>

 docs/man/man1/heat-db-setup.1 |   77 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

commit 91352c012bc396aae9b1ed264eb9de5f09ff3817
Author: Ian Main <imain@redhat.com>
Date:   Tue Jun 12 16:37:26 2012 -0700

    Pass Full Credentials to Engine
    
    In order to support HA operations, eg restarting an instance, we
    need to have full credentials in the engine.  This patch passes
    in the credential information into the engine and uses it to validate
    the the user.  A future patch will have this information stored in
    database and associated with each stack.  It also assigns the username
    in the case of EC2 style authentication allowing us to support
    per-user stacks with EC2 auth.
    
    Change-Id: I4b92f83d4d10a2bfebd4ddedc8a4f53b3e1217fe
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/api/v1/__init__.py |    2 ++
 heat/common/context.py  |   41 +++++++++++++++++++++++++++++----
 heat/engine/manager.py  |   58 +++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 90 insertions(+), 11 deletions(-)

commit 709cf56ef71de0c96ed75a57c8043db3152e7e3a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 13 12:54:57 2012 +1000

    Implement the user/access keys using keystone
    
    Still no groups or policies
    
    Change-Id: I3a78a62f741ed5979994b327e269fb9407bcebff
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |   32 ++++++++----
 heat/engine/user.py      |  127 +++++++++++++++++++++++++++++++++++++++++-----
 tools/pip-requires       |    1 +
 3 files changed, 138 insertions(+), 22 deletions(-)

commit 6d4c5618db43725c0af2b37661911a960bfa0aa2
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 12 16:42:06 2012 +1000

    Allow an already deleted watch to not fail the stack.delete().
    
    Change-Id: I1fbf46475b901bb2cc3b85784444e547ab9d9e67
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/cloud_watch.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit b343c6b8381bf9ea5085b3f8bcf555cc0c9cd792
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 12 14:34:41 2012 +1000

    Delete redundant escalation_policy (rather use instance.restarter)
    
    Change-Id: Ia5f6b6adfc5c8c60e1db5b2f4e0aa186d0437ad9
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/escalation_policy.py |   63 --------------------------------------
 heat/engine/resource_types.py    |    2 --
 2 files changed, 65 deletions(-)

commit a8ae32ab5cf65c3f680a8a51fc109be843f8919d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 12 12:45:35 2012 +1000

    Make sure create happens if a resource has been deleted
    
    (recovery situation)
    
    Change-Id: Ife4492bb32c4b1bbcedeba6e6bdd89bd952effcd
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/cloud_watch.py       |    5 ++---
 heat/engine/eip.py               |   10 ++++------
 heat/engine/escalation_policy.py |    5 ++---
 heat/engine/instance.py          |   10 ++++------
 heat/engine/resources.py         |    2 +-
 heat/engine/security_group.py    |    5 ++---
 heat/engine/volume.py            |   11 ++++-------
 heat/engine/wait_condition.py    |   10 ++++------
 8 files changed, 23 insertions(+), 35 deletions(-)

commit 986d203cca0badb565708ab4dfad5620eea0b969
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 12 12:58:34 2012 +1000

    Make sure the 'nova_instance' is refreshed when ever the state changes
    
    Change-Id: Ifadfb12bcd933ac66681fc94335c1ddd83fc31be
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

commit 014566935ae1b89e7a83a0da64e0f4b14ef81cc9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 12 12:35:04 2012 +1000

    When restarting a resource make sure that the parsed_template_id is set
    
    we need this to re-create resources else we get foreign key errors
    from the db.
    
    Change-Id: I41b142db020ae84026f3b7007ecd7d927a27880d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit 1da0f5d97429d3e89fe0419592204ec437c69753
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Jun 8 11:36:49 2012 +0200

    Fix heat-jeos installation in Getting Started
    
    Change-Id: Idc6a3a7d5b541e03e99eba69fb91f0b069d789c0

 docs/GettingStarted.rst |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 834c13e4ab7683a62b43d3b1109faf8ae0344b7b
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Jun 8 11:24:04 2012 +0200

    Make heat-keystone-service a tad more robust
    
    The ADMIN_ROLE extraction failed when the column with the role names was
    centered instead of left-aligned.
    
    Change-Id: If39292b65dfce5fa820396e49e72fc635c2cb0c2

 tools/heat-keystone-service |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 23305fb9fc1401c472afb7b7a39ae74fe702248f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 8 12:54:03 2012 +1000

    Add install.sh
    
    fixes #134
    
    Change-Id: I5d0aa01143050a305c44573220e96dba9f81e1ae
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 install.sh |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit 0b7feab00b3f85cfa10a2cb78825ffdc65a73e46
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 8 12:06:50 2012 +1000

    Add EstimateTemplateCost API
    
    see #1
    
    Change-Id: Ib362b5320b5fa050dfb70202838042e222287534
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat                |   34 ++++++++++++++++++++++++++++++++++
 heat/api/v1/__init__.py |    1 +
 heat/api/v1/stacks.py   |    4 ++++
 heat/client.py          |    3 +++
 4 files changed, 42 insertions(+)

commit 3601fb263c1dfa6cfd2e5a3e18e6d6690e5eb62c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Jun 8 11:35:56 2012 +1000

    Add the GetTemplate API
    
    see #1
    
    Change-Id: I178a1d9a19570296b62381548434fb4fcf836fee
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat                |   14 +++++++++++---
 heat/api/v1/__init__.py |    1 +
 heat/api/v1/stacks.py   |   19 +++++++++++++++++++
 heat/client.py          |    3 +++
 heat/engine/manager.py  |   14 +++++++++++++-
 5 files changed, 47 insertions(+), 4 deletions(-)

commit 4c359db1b01d6b1be90dc872f7e1620b077ac918
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Jun 7 07:47:47 2012 -0700

    Remove cfntools and jeos
    
    These files are now available in the heat-jeos repository.
    
    Change-Id: I392e7443348a31e8454ae14d957b0b54560c2ec3
    Signed-off-by: Steven Dake <sdake@redhat.com>

 MANIFEST.in                            |   14 -
 bin/heat                               |   25 +-
 docs/GettingStarted.rst                |   28 +-
 heat/cfntools/README                   |   13 -
 heat/cfntools/cfn-get-metadata         |   91 ----
 heat/cfntools/cfn-hup                  |  114 ----
 heat/cfntools/cfn-init                 |   74 ---
 heat/cfntools/cfn-push-stats           |  169 ------
 heat/cfntools/cfn-signal               |   91 ----
 heat/cfntools/cfn_helper.py            |  893 --------------------------------
 heat/jeos/F16-i386-cfntools-jeos.tdl   |   28 -
 heat/jeos/F16-i386-gold-jeos.tdl       |   60 ---
 heat/jeos/F16-x86_64-cfntools-jeos.tdl |   28 -
 heat/jeos/F16-x86_64-gold-jeos.tdl     |   60 ---
 heat/jeos/F17-i386-cfntools-jeos.tdl   |   28 -
 heat/jeos/F17-i386-gold-jeos.tdl       |   60 ---
 heat/jeos/F17-x86_64-cfntools-jeos.tdl |   28 -
 heat/jeos/F17-x86_64-gold-jeos.tdl     |   60 ---
 heat/jeos/U10-amd64-cfntools-jeos.tdl  |   25 -
 heat/utils.py                          |  214 --------
 20 files changed, 14 insertions(+), 2089 deletions(-)

commit 4b5c3fee7b7deba2c909247c5e65c2537be554ad
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 7 15:05:54 2012 +1000

    Convert getLogger(__file__) into getLogger('heat...')
    
    Makes a mess of logs when not installed.
    
    Change-Id: Iab6bd247b943f276bf8de64aed65619b38f99acb
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/db/sqlalchemy/session.py |    2 +-
 heat/engine/checkeddict.py    |    2 +-
 heat/engine/eip.py            |    2 +-
 heat/engine/parser.py         |    2 +-
 heat/engine/resources.py      |    2 +-
 heat/engine/security_group.py |    2 +-
 heat/engine/user.py           |    2 +-
 heat/engine/volume.py         |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

commit aca71be770e2bc0fecd06a64a7e36bcb7cf686a3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Jun 7 11:41:03 2012 +1000

    Add a Timeout (-t) to the heat options (and make -f for templates).
    
    This makes the cli more consistent with AWS and implements
    the timeout feature.
    
    Note: the timeout is in minutes and defaults to 60 minutes.
    
    Change-Id: I41dea75170c871c1ee47948643311752d9d5e41e
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat                |    7 ++++-
 docs/man/man1/heat.1    |    2 +-
 heat/api/v1/stacks.py   |    2 ++
 heat/cloudformations.py |    2 +-
 heat/engine/manager.py  |    5 ++--
 heat/engine/parser.py   |   71 ++++++++++++++++++++++++++++++++++-------------
 6 files changed, 65 insertions(+), 24 deletions(-)

commit 7e02a65f79b8a356b93822555caf40f0a9dfdb97
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 6 23:07:54 2012 +1000

    Fix the setup of daemon config
    
    Change-Id: I02d4a3da63d2438067cf64c15432d66b539c30bc
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat-api          |    2 +-
 bin/heat-engine       |    2 +-
 bin/heat-metadata     |    2 +-
 heat/common/config.py |   29 ++++++-----------------------
 4 files changed, 9 insertions(+), 26 deletions(-)

commit a724259609d288781e1384745c5d9b40b42c7693
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Jun 6 15:15:15 2012 +1000

    Update openstack-common
    
    Change-Id: I5af06e0d44a69b9f968fce91db441157a69ea9c7
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/openstack/common/cfg.py         |  427 ++++++++++++++++++++++++++--------
 heat/openstack/common/importutils.py |    7 +-
 heat/openstack/common/setup.py       |   23 +-
 heat/openstack/common/timeutils.py   |    2 +-
 4 files changed, 353 insertions(+), 106 deletions(-)

commit 7e81a8a8f9650a9df8c879b817941927447d43c3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 5 15:02:45 2012 +0200

    Improve parser readability + add unit tests
    
    Change-Id: I7dd8c394e6543d1ee545648af32c9025c522b6e0
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parser.py     |   19 ++++-------
 heat/tests/test_parser.py |   82 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 12 deletions(-)

commit 3c33de8b9fe02532e0db4f224998f329e2c4fb48
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Jun 5 12:07:37 2012 +0200

    Fix parsing of metadata
    
    I broke metadata in bece6593f00f8e096f045982673f85c67863b932 by no longer
    updating the parsed template in the database. We need to resolve references
    runtime data before storing the parsed template, because the metadata code
    uses this directly.
    
    Change-Id: I753fe199779ae1b0046366abadca0111a81463c6
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/cloud_watch.py    |    2 +-
 heat/engine/instance.py       |    3 ++-
 heat/engine/parser.py         |    5 ++++-
 heat/engine/resources.py      |    7 ++++---
 heat/engine/wait_condition.py |    7 ++++---
 5 files changed, 15 insertions(+), 9 deletions(-)

commit 5c3fc7bb61418ab0cad43ec0247f6f1566662575
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 15:02:05 2012 +1000

    Rely on instance_id been set to None
    
    Then we can use the default FnGetRefId()
    
    Change-Id: Ib328289b4d22cb7ab7b9985fa7c95cb19bcfd9c3
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/user.py           |    1 -
 heat/engine/wait_condition.py |   11 -----------
 2 files changed, 12 deletions(-)

commit 963e96e010c33d8dfbd8f32c6b7d9e275d45814b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 14:29:26 2012 +1000

    wait_condition: use properties not t['Properties']
    
    Change-Id: I81fc0dd654e9011fc7404f184390379edeacda8f
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/wait_condition.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f5c88891cb3754f68dec03dfb642a8185c6eb70d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 09:31:34 2012 +1000

    Fix cloudwatch delete
    
    Change-Id: I091bb394f5ad3afad82d55f4a81bdce94cc09b71
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/cloud_watch.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8c30545f871d92f97780a6389b5b06148c59f441
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 11:22:07 2012 +1000

    Fix restart_resource()
    
    Change-Id: Ia77c9a5ab4107d9803a6e8180fd9e34ac13436f5
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit b0894d0e53d2c1f54099c931e630cc3a7f438e03
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 11:11:05 2012 +1000

    Pass the context to the db calls
    
    Change-Id: I38937ee37926507dab8a7ff9e0d0d42a3ada707d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/cloud_watch.py    |    4 ++--
 heat/engine/manager.py        |   25 +++++++++++++------------
 heat/engine/parser.py         |   11 ++++++-----
 heat/engine/resources.py      |    7 ++++---
 heat/engine/wait_condition.py |    2 +-
 5 files changed, 26 insertions(+), 23 deletions(-)

commit 360c279c49b34c24ce4370a9e7b11241b609cf15
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 09:34:40 2012 +1000

    add user auth to ha template
    
    Change-Id: I044d153bc33de08c6736fd4dd32380ceb0bf8caa
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_Single_Instance_With_HA.template     |   24 ++++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

commit 4a19ab5903f0be6bdc56f98227665cb72e22fddd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 10:57:08 2012 +1000

    Make sure the resource exists before trying to update it.
    
    Change-Id: I5d8bdc0f4ceff61cab0b909dcaaf8ab5952ba4af
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit f0b75758f634ce0d782a707d8ae451f428216d17
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 10:36:21 2012 +1000

    Fix the conversion from instance to resource name
    
    Change-Id: Iaca10eb5468bd7b64b6a66f87fc6f7066053cb27
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/instance.py |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit 2d4d5529f9045ca48f8d98b31f5a119f828acca7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Jun 5 10:04:16 2012 +1000

    Restructure watchrules to make them more testable
    
    Change-Id: Ic8085de3f5692249d82e68462bbed02da787712f
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py   |  123 ++++++++++----------------------
 heat/engine/watchrule.py |  142 +++++++++++++++++++++++++++++++++++++
 heat/tests/test_watch.py |  177 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 357 insertions(+), 85 deletions(-)

commit a9135324f654c90d4da859b1b727836daa48b871
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Sun Jun 3 22:12:58 2012 +1000

    Add missing properties to cloud watch
    
    Change-Id: I8d4be61d1a0b7bd37c97148ca291d22487ee22ba
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/cloud_watch.py |    2 ++
 1 file changed, 2 insertions(+)

commit 70c687ccf735ce8194b1e774880493c8e7047226
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Mon Jun 4 13:13:21 2012 -0400

    Change command interpreter to bash
    
    This is important since /bin/sh is symlinked to dash by default on
    Debian based systems.
    
    Change-Id: I47b6317981ec020bed0bc45f7f68b636d71023d6
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 tools/heat-keystone-service |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ba49964211fb4e8f5052d17840f4654e7205d646
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Jun 4 16:44:20 2012 +0200

    Add qpid-cpp-server to the openstack setup script
    
    Change-Id: Ie63b1031583091b5bdfd52f79e59b841f21ee778

 tools/openstack |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 93ea554c0e72fa02b9cbdaf616b905039faf8d79
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Jun 4 21:16:31 2012 +1000

    Teach heat-api about the bind_host
    
    Change-Id: Ica32693373a87f01c41755a2b041c187bddd034d
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat-api          |    7 ++++---
 heat/common/config.py |    7 ++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

commit bece6593f00f8e096f045982673f85c67863b932
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Jun 1 10:50:15 2012 +0200

    Refactor template resolution
    
    Resolve functions in templates by making a copy of the data rather than
    modifying the original. This means that e.g. a resource resolving functions
    in its own template data does not result in changes to the data held by the
    Stack.
    
    This patch also refactors all of the template resolution methods to operate
    using a common parsing algorithm to move through the tree.
    
    Finally, the resources have been worked to load data as it is needed,
    rather than requiring external code to put them into the correct state
    before using them.
    
    Change-Id: I79eafaefc9ced07b652fac7162aa2edbfa7f547a
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/eip.py           |   28 +++---
 heat/engine/instance.py      |   36 +++----
 heat/engine/parser.py        |  215 +++++++++++++++++++++---------------------
 heat/engine/resources.py     |   44 +++------
 heat/tests/test_resources.py |    8 +-
 heat/tests/test_stacks.py    |    6 +-
 heat/tests/test_validate.py  |    6 --
 7 files changed, 153 insertions(+), 190 deletions(-)

commit abd4b735e5f2d32e3d7bf5580b128090af0f8e4d
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Jun 1 13:55:54 2012 -0700

    U10 wordpress template
    
    Change-Id: I25beb7b48e287b3097379c1e1f92adc309ce9c83
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_Single_Instance_deb.template |  138 ++++++++++++++++++++++
 1 file changed, 138 insertions(+)

commit 1852373470a7b41bc20c3cfba2e7fb7922c0748e
Merge: 6b0e7a4 4b1e386
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Fri Jun 1 19:18:32 2012 +0000

    Merge "Fix the Getting Started guide for the new setup.py"

commit 6b0e7a4314d0573319f55da3833b5b0f2b56435e
Author: Ian Main <imain@redhat.com>
Date:   Fri Jun 1 11:50:36 2012 -0700

    Fix new pep8 warnings.
    
    With the new release of pep8 we have some different requirements.
    This patch fixes them all.
    
    Change-Id: Ief16becba47007460f8b125907b055aa51de999e
    Signed-off-by: Ian Main <imain@redhat.com>

 bin/heat                               |    6 +++---
 heat/api/v1/stacks.py                  |    4 ++--
 heat/cfntools/cfn_helper.py            |    4 ++--
 heat/db/sqlalchemy/api.py              |    6 +++---
 heat/db/sqlalchemy/models.py           |   14 +++++++-------
 heat/engine/checkeddict.py             |    6 +++---
 heat/engine/cloud_watch.py             |    2 +-
 heat/engine/eip.py                     |   10 +++++-----
 heat/engine/escalation_policy.py       |    2 +-
 heat/engine/instance.py                |    8 ++++----
 heat/engine/manager.py                 |    6 +++---
 heat/engine/parser.py                  |    8 ++++----
 heat/engine/resources.py               |    4 ++--
 heat/engine/security_group.py          |    4 ++--
 heat/engine/volume.py                  |   10 +++++-----
 heat/engine/wait_condition.py          |    6 +++---
 heat/metadata/api/v1/__init__.py       |    2 +-
 heat/openstack/common/setup.py         |    2 +-
 heat/tests/functional/test_bin_heat.py |    2 +-
 heat/tests/test_cfn.py                 |    6 +++---
 heat/tests/test_resources.py           |   22 +++++++++++-----------
 heat/tests/test_stacks.py              |   16 ++++++++--------
 heat/tests/test_validate.py            |   14 +++++++-------
 heat/utils.py                          |   30 +++++++++++++++---------------
 24 files changed, 97 insertions(+), 97 deletions(-)

commit 4b1e386c795299fadfb7227db171235ed4b33ebc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 31 16:09:35 2012 +0200

    Fix the Getting Started guide for the new setup.py
    
    With the new setup.py script, OpenStack must be installed before heat,
    otherwise PIP will start importing bogus dependencies (at least on Fedora).
    
    Also install stuff that was previously being installed by setup.py. This
    will eventually be replaced with an install script (see #134).
    
    Change-Id: I942def545f9351a1f3238dac49f34b13370e2597
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

commit fdfb967cef058cad934abc3c11d7f3785b540903
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 31 11:17:30 2012 +0200

    Refactor Resource creation
    
    Allow the Resource class to instantiate the correct type of object for each
    resource.
    
    Change-Id: I518f27fa27f675b9e497aac40962331833077aed
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parser.py         |   37 ++++------------------------
 heat/engine/resource_types.py |   53 +++++++++++++++++++++++++++++++++++++++++
 heat/engine/resources.py      |   12 ++++++++++
 3 files changed, 70 insertions(+), 32 deletions(-)

commit ee2500263d0053c0850c92309c6dcbe12a014626
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 31 11:17:30 2012 +0200

    Clean up imports
    
    Change-Id: Ibca9c8ab8b9dafb813baee6a9c4aa024bf9733e2
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/eip.py            |    2 --
 heat/engine/instance.py       |    5 -----
 heat/engine/manager.py        |    6 ------
 heat/engine/resources.py      |    5 -----
 heat/engine/security_group.py |    2 --
 heat/engine/user.py           |    2 --
 heat/engine/volume.py         |    1 -
 heat/engine/wait_condition.py |    1 -
 8 files changed, 24 deletions(-)

commit 0da631a3216ac5c76e7c12ca606b7be78a28d052
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 31 11:17:30 2012 +0200

    Don't use sys.exc_value
    
    sys.exc_value has been deprecated since Python 1.5, and is not thread-safe.
    The replacement is sys.exc_info(), but in this case we don't need even that
    since we have the exception in question available.
    
    Change-Id: Ibb4b354fd099fbf0d6390163eb4f7cc9e97db0e9
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py |    7 +++----
 heat/engine/parser.py  |    5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

commit cfe391073a681ba8f1b806fc53428adb36486181
Author: Zane Bitter <zbitter@redhat.com>
Date:   Thu May 31 11:17:30 2012 +0200

    Get list properties working again
    
    The CloudFormation documentation is very confusing on this point.
    'CommaDelimitedList' is one of the data types that are valid for a
    Parameter (the others are 'String' and 'Number'). A CommaDelimitedList
    parameter takes the form of a string where the list members are delimted by
    commas:
    
        "item1,item2,item3"
    
    However the documentation also uses the phrase "Comma Delimited List" to
    refer to the type of some Resource Properties that are, in fact, simply
    lists:
    
        [ "item1" , "item2" , "item3" ]
    
    ...as if there were *another* way to represent lists. (Note that the
    items here need not be strings, and in fact are usually objects of some
    variety.)
    
    So we need a different data type to represent the latter. (This patch
    changes the name from 'TupleList' to just 'List', since the actual Python
    sequence type is just an implementation detail.) In future, we should
    probably also verify that only the 3 valid Parameter types are used, and
    perhaps that list Properties contain only objects of the correct type.
    
    Change-Id: I94054f588fc37f7d4ba245f2e92b86ac9c872c37
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/checkeddict.py    |   46 ++++++++++++++++++++++-------------------
 heat/engine/instance.py       |    8 +++----
 heat/engine/security_group.py |    4 ++--
 heat/engine/user.py           |    2 +-
 heat/engine/volume.py         |    2 +-
 5 files changed, 33 insertions(+), 29 deletions(-)

commit d1f71f6d5d4dbbcc68d33f3779f09aaaf4aefd19
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 31 14:25:59 2012 +1000

    Remove _authenticate() check for metadata calls (temp)
    
    To be replaced by proper AWS auth, which needs AWS::IAM::AccessKey
    resource type to be hooked up.
    
    Change-Id: Icbdb08493fb51add5e6d3d5f4a153595f93c8f75
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat-metadata      |    2 +-
 heat/engine/manager.py |   15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

commit 07d1eb9b78e72ae6266680f13824b254a7564d6b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 31 10:48:35 2012 +1000

    Fix the HA template (sed the username/password)
    
    Change-Id: I835a9f6d2a9abfdeb5af8fb703c8abae5afae2d1
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_Single_Instance_With_HA.template     |    5 +++++
 1 file changed, 5 insertions(+)

commit 5f7cf95f26bb7c2c26f1dba70502ff2bfc4b9db0
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 30 14:49:27 2012 -0700

    Fix apt-get install
    
    rpm deps not available on ubuntu systems
    fix apt-get install doesn't work (string vs list)
    
    Change-Id: Ic2da1415f9bccb15321afd0ed5111041cbf2a2d0
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/cfntools/cfn_helper.py |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

commit 13e6e7d1a9309d8510d489d789dbd862c539d37d
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 30 20:06:23 2012 -0700

    Remove python 2.7ism
    
    Change-Id: I9e74d79e42cc22aa0f0883fb1e1582be2860d842
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/cfntools/cfn_helper.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f924a681ea005650fae60fcc52c6dc66bfd9b1db
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 30 13:26:20 2012 -0700

    Compress qcow2 files to take up less disk space
    
    This results in less data transferred during a glance registration.
    
    Change-Id: I36d17c6e1bf12e3e0f37394d5522c6f4f59313de
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c2f0e488f3b09cfd6dbb81d70ec67ff8b2746dc8
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 30 11:15:34 2012 -0700

    Install argparse and update the U10 package cache
    
    cfntools require argparse
    U10 package cache needs updating to install packages correctly
    
    Change-Id: I3630f5082d4b9f73fa95805d51684a68bf8c0d6e
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/U10-amd64-cfntools-jeos.tdl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a093e6d074872c761dda3ab84701e35b019c4204
Author: Ian Main <imain@redhat.com>
Date:   Wed May 30 10:46:15 2012 -0700

    Fix auth failed exception handler
    
    This patch fixes the auth failed exception handler so that we
    get back a meaningful result when authentication fails.
    
    Change-Id: I2f37daed3890fd685fa6f701938b675460e76b0c
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/common/client.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit daa2c72f0cbe1c860e65821cb9566ea97e0bda4a
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 30 16:52:17 2012 +0200

    Set stack's `updated_at` time
    
    Fixes #126
    
    Change-Id: Ie7abe6c3385632138671cb0b7f12dfa33e69bae0

 heat/engine/resources.py |    6 ++++++
 1 file changed, 6 insertions(+)

commit bd281338493ea3612c65602b60a578276be5db89
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 25 11:53:57 2012 +1000

    Add instance restarter
    
    Change-Id: I8ef28efc7d86a1a3a44f4784cb496c415a14f95c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/instance.py                            |   28 +++++++++++++
 heat/engine/parser.py                              |   43 ++++++++++++++++++++
 .../WordPress_Single_Instance_With_HA.template     |    4 +-
 3 files changed, 73 insertions(+), 2 deletions(-)

commit afa0d4cf0b48eaf8fb790e0e31649e952b2e5e84
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 30 13:10:02 2012 +1000

    Add a name to the checkeddict to improve the error messages
    
    Change-Id: I11edc3bce77cd84d0393d6d95c6733b7901f95a1
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/checkeddict.py          |   48 ++++++++++++++++++++---------------
 heat/engine/parser.py               |    2 +-
 heat/engine/resources.py            |    2 +-
 heat/tests/unit/test_checkeddict.py |    2 +-
 4 files changed, 31 insertions(+), 23 deletions(-)

commit a5962d10782263a33e7d3fb403b12ee3149e408f
Author: Ian Main <imain@redhat.com>
Date:   Tue May 29 14:09:57 2012 -0700

    Authentication Overhaul
    
    This patch updates the authentication system set up in heat:
    
    - We now authenticate against the 'heat' service at the entry
      point to each api call in the engine.
    - We are now using the 'Context' class to contain the authentication
      information as intended.
    - The two context classes are unified and we now use the same one
      for both WSGI and RPC.  This is the intended design as the
      context is loaded by the WSGI middleware and then passed into the
      RPC methods.
    - We are now doing token authentication in the API that works with
      both native keystone and AWS style authentication.  That token is
      then passed on to the engine for further authentication for various
      endpoints.
    
    Note that the heat-api-paste.ini file requires updating in order for
    this to work on your system.  Admin user and password must be set
    properly in the authtoken section in order to perform token based
    authentication.
    
    I suspect there will be a few bugs in here yet.  This is just part of
    the authentication/identification changes we need to make but I wanted
    to get this in so we could continue to work with a boto based client.
    
    Change-Id: Ib635ecd3088304e8d51d8e1fc31a8b1bf751caf3
    Signed-off-by: Ian Main <imain@redhat.com>

 etc/heat-api-paste.ini           |   34 ++-
 heat/api/v1/__init__.py          |   82 ++++++
 heat/api/v1/stacks.py            |   36 ++-
 heat/common/auth_token.py        |  534 ++++++++++++++++++++++++++++++++++++++
 heat/common/context.py           |  106 +++++---
 heat/context.py                  |  125 ---------
 heat/engine/manager.py           |   68 ++++-
 heat/engine/parser.py            |    8 +-
 heat/engine/resources.py         |   13 +-
 heat/metadata/api/v1/metadata.py |    2 +-
 heat/rpc/amqp.py                 |    2 +-
 heat/rpc/impl_fake.py            |    2 +-
 heat/service.py                  |    2 +-
 heat/tests/test_resources.py     |    4 +-
 heat/tests/test_stacks.py        |    8 +-
 heat/tests/test_validate.py      |   22 +-
 16 files changed, 828 insertions(+), 220 deletions(-)

commit 9ea875a250637664b009f332fd9c40ba126b5ee9
Merge: 29aea9c 9098543
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Tue May 29 21:40:06 2012 +0000

    Merge changes I31d97b0d,I10507113
    
    * changes:
      Changed SecurityGroups property type to TuplesList
      Change the policies for User to TuplesList

commit 29aea9c552f77209cb56b260cc40aa08237b588e
Merge: 8803a2c 71681de
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Tue May 29 21:37:22 2012 +0000

    Merge changes I475ac4f7,I212cffac
    
    * changes:
      Add missing "properties_schema" to WaitConditionHandle
      Fix jeos_path when not intalled as an egg

commit 909854333857706070973883d7bc4e55af53f394
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue May 29 15:03:05 2012 -0400

    Changed SecurityGroups property type to TuplesList
    
    Change-Id: I31d97b0de6e72bd24f0f78d86890726fc1e8a138

 heat/engine/instance.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 99e1bc728b7b54ba8d2a3a64545a5f288fb21583
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue May 29 11:08:02 2012 -0400

    Change the policies for User to TuplesList
    
    Change-Id: I105071135a6b20a414c2f4016ca3a8312a4ee2a2

 heat/engine/user.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8803a2c66e9680ecb35f08139f7c6654aba799a5
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Sat May 26 14:16:19 2012 -0400

    Add missing flags to enable working with RabbitMQ
    
    Note: rpc_backend=heat.rpc.impl_kombu must be set in both heat-api.conf
    and heat-engine.conf.
    
    Change-Id: Ia7f5af8805240381f28ecae1efc0a677155f898e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/common/config.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit f3913a9a3e8f0f84f74ba65a1ba7634e231f354a
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 23 17:59:41 2012 +0200

    cloudwatch: set HA template to send watch data
    
    The Wordpress HA template is now able to utilize the cfn-push-stats and send
    alarm messages to the metadata server.
    
    Change-Id: I52b615d3401dc2665e2b30e4a925d61ed204c827
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 MANIFEST.in                                        |    1 +
 heat/cfntools/cfn-hup                              |    6 --
 heat/cfntools/cfn-push-stats                       |   29 ++++++---
 heat/cfntools/cfn_helper.py                        |   30 ---------
 heat/common/exception.py                           |    2 +
 heat/engine/checkeddict.py                         |    4 ++
 heat/engine/cloud_watch.py                         |    5 ++
 heat/engine/escalation_policy.py                   |   64 ++++++++++++++++++++
 heat/engine/parser.py                              |    9 ++-
 heat/engine/resources.py                           |    8 ++-
 heat/engine/wait_condition.py                      |    1 +
 heat/jeos/F16-i386-cfntools-jeos.tdl               |    1 +
 heat/jeos/F16-x86_64-cfntools-jeos.tdl             |    1 +
 heat/jeos/F17-i386-cfntools-jeos.tdl               |    1 +
 heat/jeos/F17-x86_64-cfntools-jeos.tdl             |    2 +-
 heat/jeos/U10-amd64-cfntools-jeos.tdl              |    1 +
 heat/utils.py                                      |    4 +-
 .../WordPress_Single_Instance_With_HA.template     |   39 +++---------
 18 files changed, 125 insertions(+), 83 deletions(-)

commit 1d5aec19d72aecdf6158e90f55d42a9abe280dd5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 25 19:24:29 2012 +1000

    Add the basic cloudwatch feature
    
    Fix watch db tables and silly programming errors.
    get basic posting data to metadata server working
    add watch_rule_get_all()
    check for alarms in a periodic task
    delete watch_data when the rule is deleted
    add a last_evaluated field to the watch_rule
    remove unused option to watch_data_get
    take better account of the sample period.
    - still much to be done here (evaluation periods).
    add some useful stats to cfn-push-stats
    fix how the metric is accessed
    fix a divide by zero
    
    Change-Id: Iaf98499d0e3ac6d6f951ea38b3b0f409669258da
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn-push-stats                       |  158 ++++++++++++++++++++
 heat/db/api.py                                     |   28 ++++
 heat/db/sqlalchemy/api.py                          |   63 ++++++++
 .../migrate_repo/versions/004_guest_watch.py       |   57 +++++++
 heat/db/sqlalchemy/models.py                       |   26 ++++
 heat/engine/cloud_watch.py                         |   92 ++++++++++++
 heat/engine/manager.py                             |  124 +++++++++++++++
 heat/engine/parser.py                              |    2 +
 heat/metadata/api/v1/__init__.py                   |    8 +
 heat/metadata/api/v1/metadata.py                   |   21 +++
 .../WordPress_Single_Instance_With_HA.template     |   20 +++
 11 files changed, 599 insertions(+)

commit 71681dec4479b1a77ce5a40cff0da282c739419d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 25 12:12:14 2012 +1000

    Add missing "properties_schema" to WaitConditionHandle
    
    Change-Id: I475ac4f72613a2f20275949a01168246cae1fb52
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/wait_condition.py |    1 +
 1 file changed, 1 insertion(+)

commit 07018fe88a020532649369750fbcc529196571d7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 25 11:51:21 2012 +1000

    Fix jeos_path when not intalled as an egg
    
    Also use os.path.join() to sort out trailing "/"
    
    Change-Id: I212cffacc018f456894e9b7921fef75256edcf45
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat      |   11 ++++++++---
 heat/utils.py |    4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

commit a16a8bb9c272613bcd8e705e1e53aa5c0771f569
Merge: c3256b5 84b6569
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Fri May 25 00:29:15 2012 +0000

    Merge "Changes to checkeddict for tuples and required"

commit c3256b508334396d78c7faeec255c732faea7fe2
Author: Steven Dake <sdake@redhat.com>
Date:   Thu May 24 17:12:27 2012 -0700

    Allow login to U10 jeos launched from heat
    
    cloudinit on debian expects the user "ubuntu" - hard code to ec2-user
    useradd doesn't create home directories on U10 without -m option
    
    Change-Id: Iaaee6df560b60e203b17a36bba57ac410ad6ed56
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/cloudinit/config                 |    3 ++-
 heat/jeos/U10-amd64-cfntools-jeos.tdl |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 84b6569ae65f766fdb225dbdf96db73c1bf1cb58
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 24 15:22:41 2012 -0400

    Changes to checkeddict for tuples and required

 heat/engine/checkeddict.py    |    8 +++++---
 heat/engine/security_group.py |    4 ++--
 heat/engine/volume.py         |    3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

commit 4c1adc193f95a9b1ee5df81b318e8150b1b1b7b6
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 23 18:24:57 2012 -0700

    Make i386 cfntools jeos work
    
    was expectin cfg-* instead of cfn-*
    
    Change-Id: I6234829d92a33e8bd4a8fab246ded2c1a43afc55
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-i386-cfntools-jeos.tdl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0cdccbd93f478244e65b3f1d74519721d6e113bf
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 23 16:09:00 2012 -0700

    Add U10 JEOS support to heat jeos_create
    
    This requires oz 0.9.0 (or latest master).  0.8.0 shipped with
    most distros does not have customization support for Ubuntu
    images.
    
    fixes issue #23
    
    Change-Id: I854aaf9657353b3fdb4768a277b527304e88ac8e
    Signed-off-by: Steven Dake <sdake@redhat.com>

 MANIFEST.in                           |    1 +
 heat/jeos/U10-amd64-cfntools-jeos.tdl |   24 ++++++++++++++++++++++++
 heat/utils.py                         |    7 ++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

commit 03ae5b2d1c33d23105206398425d235e21e7c223
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 24 21:01:46 2012 +1000

    Validate all resource properties
    
    Change-Id: Ib0346fd22636d3eae31c688426b966f07acda19c
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 MANIFEST.in                   |    1 -
 heat/cfntools/cfn_helper.py   |    2 +-
 heat/common/auth.py           |    2 +-
 heat/common/client.py         |    4 +--
 heat/engine/checkeddict.py    |   49 +++++++++++++++++++++++++++------
 heat/engine/eip.py            |   41 +++++++++++++++++----------
 heat/engine/instance.py       |   61 +++++++++++++++++++++++++++++++----------
 heat/engine/parser.py         |    7 +++--
 heat/engine/resources.py      |   25 +++++++++++++----
 heat/engine/security_group.py |   20 ++++++++------
 heat/engine/user.py           |   16 +++++++++++
 heat/engine/volume.py         |   35 ++++++++++++++---------
 heat/engine/wait_condition.py |   27 +++++-------------
 13 files changed, 197 insertions(+), 93 deletions(-)

commit a83fcc6aa33540257762cd73196e8bbb448ef10b
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed May 23 16:13:00 2012 -0400

    Add functional test to verify jeos and stack ops
    
    (Tox.ini has been modified to only run tests tagged with 'unit'
    to prevent this test from running with unit tests.)
    
    This test requires an OpenStack install present and will not run on
    StackForge. This test creates a JEOS, waits for glance registration,
    detects key registered with keystone, creates stack, and verifies over
    SSH that:
    - cfn helper script SHAs match tree
    - verifies presence of wordpress
    - verifies expected user data is present in multipart mime file
    
    closes #112
    
    Change-Id: I22a0dfe41986d466ac689c050fc33585e3e6229e
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/tests/functional/test_bin_heat.py |  250 ++++++++++++++++++++++++++++++++
 tox.ini                                |    6 +-
 2 files changed, 253 insertions(+), 3 deletions(-)

commit a4f5ae264d669eaf4a484f4877d0ebad7070f753
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 23 16:19:33 2012 -0400

    Fixing variable name for debug message
    
    Change-Id: I5992e0c449b5caeff3fd91c3aefe721ab32830c4

 heat/engine/parser.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b00987868101b75aa599723471689106b4d411e1
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 23 15:37:07 2012 -0400

    using the calculated path for the template tests
    
    Change-Id: Ifc5f142cf36a387d32f2ea70dfcb1bb33a44a056

 heat/tests/test_resources.py |    4 ++--
 heat/tests/test_stacks.py    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 5467f40da3c447f43da487b1faa8d37638c89cf5
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 23 20:34:54 2012 +0200

    Update resource statuses in the database
    
    This ensures that resources will not get deleted multiple times when
    something else fails during stack deletion.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/resources.py |    3 +++
 1 file changed, 3 insertions(+)

commit c63965b3a09c149d2bc7bd1438a1d8b03bdc3e55
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed May 23 19:14:39 2012 +0200

    Fix deletion of security groups
    
    First off, don't set the instance_id to an empty string as soon as we
    retrieve the object from the database.
    
    Also, don't fail if we try to delete a security group that no longer
    exists.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/security_group.py |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

commit 72c383396d42c21b73b4ce66717e6e0cfd2978ce
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 23 07:42:19 2012 -0700

    Only run cfn-init once
    
    cloud-config-final.service (atleast in Fedora 16) runs the user scripts.  So
    there is no need to run them in cloud-config.service (which this file is processed
    by).
    
    May need a revisit on deb based systems.
    
    Change-Id: Ib7c3d56a50bcdc4ea68626e1d57a28a4ec70e1b4
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/cloudinit/config |    1 -
 1 file changed, 1 deletion(-)

commit e4ccac1f94f4aaa9951be05ab95343b9f36b11b7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 23 22:15:38 2012 +1000

    Use the new CheckedDict for Parameters
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/instance.py |    2 +-
 heat/engine/parser.py   |   56 +++++++++++++++++++++++------------------------
 2 files changed, 28 insertions(+), 30 deletions(-)

commit af15b0d1346fac894b1daebc58634792889c9c4a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 23 21:53:11 2012 +1000

    Add some better checking for parameters and properties
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/checkeddict.py          |  115 +++++++++++++++++++++++++++++++++++
 heat/tests/unit/test_checkeddict.py |   88 +++++++++++++++++++++++++++
 2 files changed, 203 insertions(+)

commit 4955a9bf4807e37ad868ef0f20bd82e2645c25ca
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue May 22 17:05:55 2012 -0400

    Fixing path lookup to make sure the templates can be found
    
    Change-Id: Ib48c27a9d0a794d243e48661aaebb108728af6bb
    
    Conflicts:
    
    	heat/tests/test_resources.py
    	heat/tests/test_stacks.py

 heat/tests/test_resources.py |    2 ++
 heat/tests/test_stacks.py    |    2 ++
 2 files changed, 4 insertions(+)

commit 0aceb40c391db3630e3847ada2a11553eecb95f0
Merge: d3c5d74 12fbd15
Author: Jenkins <jenkins@review.stackforge.org>
Date:   Tue May 22 20:03:24 2012 +0000

    Merge "tools/openstack: Updated to latest openstack F16/F17 tools"

commit d3c5d744b64af75ff8ac29689ad120d330f0c076
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue May 22 13:29:25 2012 -0400

    Adding the AWS::IAM::User and AWS::IAM::AccessKey to the mapping

 heat/engine/parser.py |    2 ++
 1 file changed, 2 insertions(+)

commit 12fbd15b60ed9489462a46fafef31ee76776d680
Author: Steven Dake <sdake@redhat.com>
Date:   Tue May 22 09:50:53 2012 -0700

    tools/openstack: Updated to latest openstack F16/F17 tools
    
    Change-Id: I8e6b376a90ad1641c10eea2ef6711a9cd09ee2e0
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit 70020f71d94d63130be38a8b35f0520b3fa3a501
Author: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date:   Tue May 22 13:11:39 2012 +0100

    Update gitreview for new Stackforge remote
    
    Change-Id: I265b771fa2b4d040a9e90ceb265941acdea90156

 .gitreview |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2fc479c6845a71eba91ee72693caf8ab255a87bf
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 17 16:02:04 2012 -0400

    Align with project standards.
    
    Rebased from: Change-Id: Ifc9fff4f88dfaebe97b7caba4d603d23c645e346
    
    Reviewed-by: Steven Dake <sdake@redhat.com>

 .gitignore                     |    2 +
 MANIFEST.in                    |    2 +
 heat/api/v1/__init__.py        |    5 +-
 heat/openstack/common/setup.py |  183 ++++++++++++++++++++++++++++++++++++++++
 heat/testing/fake/__init__.py  |    1 -
 heat/tests/test_resources.py   |    4 +-
 heat/tests/test_stacks.py      |    4 +-
 openstack-common.conf          |    2 +-
 setup.cfg                      |    3 +
 setup.py                       |   72 +++-------------
 tools/test-requires            |    5 +-
 tox.ini                        |   36 +++++---
 var/log/heat/api.log           |    1 -
 var/log/heat/engine.log        |    1 -
 14 files changed, 236 insertions(+), 85 deletions(-)

commit 4c68cf63e3e640a843a83a70cf34742bed6f3683
Author: Steven Dake <sdake@redhat.com>
Date:   Mon May 21 16:43:48 2012 -0700

    Fedora openstack projects use new tools to setup databases
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 3970b5d76aecc0c64d408a2836df42da9c16b40f
Author: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date:   Thu May 17 11:16:00 2012 +0100

    Add .gitreview for Gerrit
    
    Reviewed-by: Steven dake <sdake@redhat.com>

 .gitreview |    4 ++++
 1 file changed, 4 insertions(+)

commit 40fd546f8390f95c7ed6fab06fbc1eac63aabf11
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 21 23:41:17 2012 +0200

    Add an integration test script
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/integration.sh |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit 21413cafcd515af253e72de6b4fc6f237c0cb684
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 21 15:41:29 2012 -0400

    Pep8 fixes

 heat/cfntools/cfn_helper.py |    2 +-
 heat/engine/parser.py       |    2 +-
 heat/engine/user.py         |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit af8dab457046b5911ad22d8442dfd153408ebfc5
Merge: a72267c 2f827bd
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 21 15:39:11 2012 -0400

    Merge branch 'puppet_instances'
    
    Conflicts:
    	heat/api/v1/__init__.py
    	heat/engine/parser.py

commit 2f827bdd2a5e6b12ee05a334096ebab1ede9580a
Merge: 7d0a350 480d382
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 21 15:33:08 2012 -0400

    Merge branch 'puppet_instances' of github.com:heat-api/heat into puppet_instances
    
    Conflicts:
    	heat/api/v1/__init__.py

commit 7d0a35030ae50d9405368d36519db712896841cd
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 21 14:50:54 2012 -0400

    Fixing _decompress to handle bundled and compressed
    
    The api call to os.path.splitext returns the root and the ext;
    however, for a .tar.gz the ext would just be the .gz, which meant
    there was no handler for a file with a .gz extension.

 heat/cfntools/cfn_helper.py |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

commit a72267cb0cab2e61e49b6f53e40aadbca3e8ec91
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 21 14:53:42 2012 +0200

    Handle failures when deleting stacks
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/instance.py |    8 ++++++--
 heat/engine/parser.py   |   30 ++++++++++++++++--------------
 heat/engine/volume.py   |    2 +-
 3 files changed, 23 insertions(+), 17 deletions(-)

commit 53eda6d78a4c8714dfdd198ad61f2505c894dcde
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 21 20:18:33 2012 +0200

    Fix problem with updating parsed template in DB
    
    The parsed template would not always be updated correctly when the actual
    template object had not changed (only the contents). This change forces an
    update by making a copy.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/parser.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

commit 08c79368245573b79acfb1e0b203813aa8de5078
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 21 15:08:36 2012 +0200

    Fix copy-paste errors in template descriptions
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 templates/WordPress_Single_Instance.template       |    2 +-
 .../WordPress_Single_Instance_With_EBS.template    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 45702a0d2690e13f923d9880b0afe64356ce5d16
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 21 14:53:03 2012 +0200

    Improvements to uninstall script
    
    - Kill only the specific heat processes we want (heat-api and heat-engine).
    - Remove installations wherever they may be located.
    - More robust handling of input.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/uninstall-heat |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

commit 80302ceffdf7a3361791f150dc3a095eb15d32ff
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 18 14:02:39 2012 +0200

    Refactor some not-particularly-Pythonic code
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/v1/__init__.py |   57 +++++++++++++++++------------------------------
 heat/engine/instance.py |   20 +++++------------
 heat/engine/parser.py   |   49 +++++++++++++++-------------------------
 3 files changed, 44 insertions(+), 82 deletions(-)

commit 8550a36f48e151a1618bf2cc9631f1788a8d7264
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 18 14:02:39 2012 +0200

    Delete networks when erasing OpenStack
    
    This is required to remove any network interfaces created using nova. If
    these are left behind they prevent a new installation of OpenStack
    re-adding them.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/openstack |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit 04da765efb31cdcb5ad59d0d188402a8d8570df6
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Fri May 18 11:10:55 2012 -0400

    Adding chaining to CommandRunner

 heat/cfntools/cfn_helper.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit cd798ff0cd5cdba71d11daa38e608c1a4dd0d4fb
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 17 10:33:39 2012 -0400

    Making PrivateDnsName return the ip address

 heat/engine/instance.py |    2 ++
 1 file changed, 2 insertions(+)

commit bba73f4c75056799ca384485016db026f38df30e
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 16 16:15:34 2012 -0400

    Adding puppet and puppet master instances

 heat/engine/parser.py                              |    8 +-
 heat/engine/security_group.py                      |    2 -
 heat/engine/user.py                                |   67 ++++++
 templates/PuppetMaster_Single_Instance.template    |  240 +++++++++++++++++++
 .../WordPress_Single_Instance_puppet.template      |  245 ++++++++++++++++++++
 5 files changed, 559 insertions(+), 3 deletions(-)

commit c9da1924bf13ab96c601bbf27f63c86a200198b0
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 18 14:02:38 2012 +0200

    Wait for instance startup in GettingStarted test
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |   58 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 14 deletions(-)

commit d9474b32c260c0914f5c607c63ade2d52eca56ef
Author: Steven Hardy <shardy@redhat.com>
Date:   Thu May 17 21:43:51 2012 +0100

    api : fix pep8 warning
    
    Fix long-line pep8 warning
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/__init__.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 67203a54975db6294469b8fb0fcfe20105830c72
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu May 17 16:49:15 2012 +0200

    Allow engine and metadata server start in any order
    
    When the metadata server starts first, it will wait for the engine to come up
    and only then registers it's hostname and port and becomes available.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 bin/heat-metadata |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 480d38266bc313197aa664c5c20f2a3b4f6d893b
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 17 10:33:39 2012 -0400

    Making PrivateDnsName return the ip address

 heat/engine/instance.py |    2 ++
 1 file changed, 2 insertions(+)

commit 1fb16a433053cff5476872f79d25cdd476a69c6f
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 16 15:15:39 2012 +0200

    Clean up the API routes
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/api/v1/__init__.py |   57 +++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 36 deletions(-)

commit 77a30304ed141c54c3b346b2cfff5ca81c231910
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 16 16:15:34 2012 -0400

    Adding puppet and puppet master instances

 heat/engine/parser.py                              |    8 +-
 heat/engine/security_group.py                      |    2 -
 heat/engine/user.py                                |   67 ++++++
 templates/PuppetMaster_Single_Instance.template    |  240 +++++++++++++++++++
 .../WordPress_Single_Instance_puppet.template      |  245 ++++++++++++++++++++
 5 files changed, 559 insertions(+), 3 deletions(-)

commit a18fb604ccecc37e73f6ea8f4f5f6a6755d60ad7
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 16 15:15:39 2012 +0200

    Clean up the API routes
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/api/v1/__init__.py |   57 +++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 36 deletions(-)

commit 53447e67fd0d14888a29e1bd683c2ff99a06bac6
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue May 8 14:26:23 2012 +1000

    Make the wait condition behave better when the stack is deleted.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/wait_condition.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 298e0921aeb081ab1e3f8aa93ab3814a849877a2
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed May 16 09:36:43 2012 +0100

    heat cli : Add options to bash completion script
    
    Ref #87 add completion of long-format options, align the command options with
    the "heat help" option
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 etc/bash_completion.d/heat |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

commit 9f8b4b42858ae6cd66c0f1e64cc8e30475b66258
Author: Steven Hardy <shardy@redhat.com>
Date:   Tue May 15 22:01:18 2012 +0100

    heat client : reduce duplication between functions
    
    Move common code into utility function to reduce duplication
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/client.py |   61 ++++++++++++--------------------------------------------
 1 file changed, 13 insertions(+), 48 deletions(-)

commit 26cc7efb4d7623be0ef994ff00cf8c00943c44e2
Author: Steven Hardy <shardy@redhat.com>
Date:   Mon May 14 23:27:02 2012 +0100

    API and heat-cli rework to align with AWS CloudFormation API
    
    Ref #115, rework API mapper to route by Action= query parameter,
    not by path, and align heat CLI tool with revised API.
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 heat/api/v1/__init__.py |   75 ++++++++++++++++++++++++++++++++++++-----------
 heat/client.py          |   23 ++++++++++-----
 2 files changed, 74 insertions(+), 24 deletions(-)

commit 0f1bd5d29102318e62b5a10281d809807bd3b163
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 15 15:03:38 2012 +0200

    Report errors when resource creation fails
    
    In order for the Stack creation to fail, resources must raise an exception
    when their creation fails. The Stack's create code will set the resource
    state appropriately; resources should not silently do it themselves.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/instance.py       |    2 +-
 heat/engine/volume.py         |    4 ++--
 heat/engine/wait_condition.py |    3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

commit 0720684956380ad3b5140f474a1c5a568bcd66f9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue May 15 11:42:37 2012 +0200

    Modify command names for consistency
    
    Replace 'events_list' with 'event-list' and 'jeos_create' with
    'jeos-create'. This makes things consistent with the conventions of
    OpenStack projects. The old versions will continue to work for now.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat                |   18 ++++++++++--------
 docs/GettingStarted.rst |   10 +++++-----
 heat/utils.py           |   12 ++++++------
 3 files changed, 21 insertions(+), 19 deletions(-)

commit 4f34681d1de31f72f6a2f7ecddb22162d5cf6373
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 14 14:24:25 2012 -0400

    Updated the version to 4
    
    Signed-off-by: Chris Alfonso <calfonso@redhat.com>

 heat/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7a28ec601e5da452f6f8395b8f809acd89bbea19
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 14 17:56:33 2012 +0200

    Make 'heat help' show a list of commands
    
    Previously we just printed an error message about not specifying a command
    to get help about, and no hint about how to work out which commands even
    existed.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 645d093c457a1ccae00d0068a6c2e76960c05b85
Author: Zane Bitter <zbitter@redhat.com>
Date:   Mon May 14 16:03:49 2012 +0200

    Allow the Getting Started script to run non-interactively
    
    Related: #84
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat                |    3 +++
 bin/heat-db-setup       |   13 +++++--------
 docs/GettingStarted.rst |    8 ++++----
 heat/utils.py           |    2 +-
 tools/heat-db-drop      |   26 ++++++++++++++++++++++----
 tools/openstack         |   39 +++++++++++++++++----------------------
 tools/uninstall-heat    |    7 ++++---
 7 files changed, 56 insertions(+), 42 deletions(-)

commit 0cd65f8cac2cb79ea469cd3473d56ecc3df33dd7
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon May 14 09:55:50 2012 -0400

    Fix pep8 errors

 heat/tests/test_cfn.py      |   10 +++++++---
 heat/tests/test_validate.py |   37 ++++++++++++++++++++++++++-----------
 2 files changed, 33 insertions(+), 14 deletions(-)

commit 596b74d72a76a41356a70026570f77c1d2fd037b
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon May 14 13:56:27 2012 +0200

    Set cfn-hup to send events to the metadata server
    
    Fixes #107
    
    This is implemented using a logging handler that sends events to the metadata
    server.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/cfntools/cfn-hup       |    9 +++-
 heat/cfntools/cfn_helper.py |  120 ++++++++++++++++++++++++++++---------------
 heat/engine/manager.py      |   28 +++++++---
 3 files changed, 108 insertions(+), 49 deletions(-)

commit 95e3a0165d8d417b46aa86ade168c6dd9d528d0c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 14 21:15:23 2012 +1000

    Slim down the getting_started template.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/getting_started.template |   34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

commit 3c84d66de9a07c69c22e94fdf743a2a4687e02eb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 14 21:14:55 2012 +1000

    Check for the presence of Metadat before trying to include it the multipart
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/instance.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 845a670f7d8b7e96db6491661bd4bdec06250520
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri May 11 19:23:27 2012 -0400

    Add status argument that shows service status for all required services
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 tools/openstack |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

commit 534416cfcd496dc7ed791278caa133f317bdee09
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 15:12:56 2012 -0700

    Kill some pep8 errors in test_stacks.py
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/tests/test_stacks.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit adc331c8184e38b550bc6fc7106fa16916d11028
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 15:10:47 2012 -0700

    Kill some pep8 errors in engine directory
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/manager.py |    3 ++-
 heat/engine/parser.py  |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

commit e4ba0e5642bbcaac28031b088d33a07141519195
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 15:07:34 2012 -0700

    Kill few pep8 errors
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/manager.py      |    1 -
 heat/tests/test_validate.py |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

commit d7568d2fa3fd6873e62d4cfe3ed169de8f32914a
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 14:58:14 2012 -0700

    Properly test ref valid against proper input
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/tests/test_validate.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit af7e57cad2466240172a3b15eb7bd61b82d1be01
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 14:55:24 2012 -0700

    Use manager to test ref validation
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/tests/test_validate.py |   46 +++++++++++--------------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

commit 6b631d9136171fc8244cce72e4810bff36102fc2
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 14:52:31 2012 -0700

    Add test cases to test valid and invalid keys in FindInMap
    
    Partially Fixes issue #111
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/tests/test_validate.py |  127 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)

commit 099318e5139d4585dd1a4d7f90e355088c987062
Author: Ian Main <imain@redhat.com>
Date:   Fri May 11 13:54:40 2012 -0700

    List stacks tests
    
    Implements a list stacks test.  This one calls straight into engine
    manager.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/tests/test_stacks.py |   38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

commit fb23391277120e1ecd76e7b94625256c097a29db
Author: Ian Main <imain@redhat.com>
Date:   Fri May 11 11:14:08 2012 -0700

    Move list_events into the class.
    
    I think I went too far last time, this should at least be a method
    of the class.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/manager.py    |   30 ++++++++++++++++--------------
 heat/tests/test_stacks.py |    3 ++-
 2 files changed, 18 insertions(+), 15 deletions(-)

commit a4f82756f8c25a80618d98e8e467c65973520aeb
Author: Ian Main <imain@redhat.com>
Date:   Fri May 11 10:47:17 2012 -0700

    Factor out a start_wordpress_stack()
    
    There was a lot of code duplication in the tests so I factored out
    a function to start a wordpress stack.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/tests/test_stacks.py |   78 +++++++++++----------------------------------
 1 file changed, 18 insertions(+), 60 deletions(-)

commit 50e5f2de917612dcf4285d9fdc66036329f1ffa5
Author: Ian Main <imain@redhat.com>
Date:   Fri May 11 10:23:38 2012 -0700

    Add event_list test.
    
    I moved parse_event out of the method and into the class so we could
    call it from the event_list test.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/manager.py    |   26 +++++++++----------
 heat/tests/test_stacks.py |   62 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 13 deletions(-)

commit 876a450a4e0a4a30f5e5097b837cf88ff61d2aad
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 11 18:54:38 2012 +0200

    Add uninstall script
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/uninstall-heat |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

commit 95e5ed067096ff52bbcd6c49146b74e1d59d2d3f
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 11 18:54:38 2012 +0200

    Add Getting Started guide to repo
    
    Convert the Getting Started wiki page to ReStructuredText format and add it
    to the repository. Also add a script that will extract the shell commands
    from the document and run them, so we can use it as an integration test.
    
    The script can be run using the command:
        > bash -c "$(./tools/rst2script.sed docs/GettingStarted.rst)"
    
    Related: #84
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 docs/GettingStarted.rst |  249 +++++++++++++++++++++++++++++++++++++++++++++++
 tools/rst2script.sed    |   38 ++++++++
 2 files changed, 287 insertions(+)

commit 65397941666a0aed0e8785a76628c57f35819a79
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 11 18:54:38 2012 +0200

    Add cfn-get-metadata to the manifest
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit cbdbf3146eb268da56f775a3a8d9d91197464e40
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri May 11 18:54:38 2012 +0200

    Fixed problems with starting MySQL in heat-db-setup
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-db-setup |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 46bdd9bb1e963f97bd45718a85ae83d6888fb659
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 09:41:51 2012 -0700

    Add test_validate_ref for invalid and valid inputs
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/tests/test_validate.py |   97 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 94 insertions(+), 3 deletions(-)

commit 7f4323365a6eedca8465fe70282c14b89cb8d78e
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 08:33:13 2012 -0700

    Check for invalid Fn::FindInMap key
    
    Partially Fixes Issue #111
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/manager.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

commit bbed10f941e59c92775db845a6d6b97e1066063c
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 11 08:30:17 2012 -0700

    Check for invalid Ref keys in validate
    
    Partially Fixes Issue #111
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/parser.py |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

commit 33c6afd6c86cf7ea42e60ef114cad6938d400929
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 11 10:45:35 2012 +1000

    TEST: slightly better version with minimal template in place.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/tests/test_validate.py |   67 +++++++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 25 deletions(-)

commit 8de0aff3d798342c831736b2fa6f8ce2e76b971a
Author: Steven Dake <sdake@redhat.com>
Date:   Thu May 10 17:10:53 2012 -0700

    Add volumeattachment validation
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/tests/test_validate.py |   80 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

commit d3bdddee682bd7039d6febee332817be099e4f86
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 10 15:31:31 2012 -0400

    Allowed the database call to return no parsed template.
    
    The database impl was raising an exception if no parsed template
    exists.  The logic that was looking up the parsed template
    expects None to be returned if the template isn't stored.
    
    * I also fixed some pep8 errors.

 heat/db/sqlalchemy/api.py          |    4 ----
 heat/metadata/api/v1/__init__.py   |    3 ++-
 heat/metadata/api/v1/metadata.py   |    9 ++++-----
 heat/tests/__init__.py             |    8 +++++---
 heat/tests/test_cfn.py             |    3 ++-
 heat/tests/test_stacks.py          |   21 ++++-----------------
 heat/tests/v1_1/fakes.py           |    3 +--
 tools/experimental_ssh_eventlet.py |    3 ++-
 8 files changed, 20 insertions(+), 34 deletions(-)

commit 3d5b05c50dc40aab5aedea1a4af8573b5e8e6212
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 10 15:02:46 2012 -0400

    Adding a deepcopy of the template before stack create validation
    
    Calling stack.validate will modify the stack's template, which
    we don't want to do.  We just want to validate the template and move
    on with an already parsed template.

 heat/engine/manager.py |   12 ++++++++++++
 heat/tests/__init__.py |    2 --
 2 files changed, 12 insertions(+), 2 deletions(-)

commit 74f9579f8988287bf1d96f81f0862236c5535286
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 10 14:04:16 2012 -0400

    Add stack delete test, and set stack to DELETE_COMPLETE when done.

 heat/engine/parser.py     |    1 +
 heat/tests/test_stacks.py |   59 +++++++++++++++++++++++++++++++++++++++++++--
 heat/tests/v1_1/fakes.py  |   42 ++++++++++++++++++++++++++++++--
 3 files changed, 98 insertions(+), 4 deletions(-)

commit 45bb10655a303991c81b5b570ffda9a9905c3a29
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 10 13:40:15 2012 -0400

    Removing stack validation on create

 heat/engine/manager.py |    7 -------
 1 file changed, 7 deletions(-)

commit 0a642cd918b93f254328236b2c1afb5a522730dc
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 9 16:49:45 2012 -0400

    Adding stack create test

 heat/tests/__init__.py    |   16 ++++-------
 heat/tests/test_stacks.py |   70 +++++++++++++++++++++++++++++++++++++++++++++
 heat/tests/v1_1/fakes.py  |   54 +++++++++++++++++++++++++++++++---
 3 files changed, 126 insertions(+), 14 deletions(-)

commit 899e952ed697d7b44b5d3b9438c95dd157f3a14a
Author: Steven Dake <sdake@redhat.com>
Date:   Wed May 9 13:35:22 2012 -0700

    Validate invalid mountpoint.device entries
    
    Since KVM only allows /dev/vd[a-z], we validate that implementation-specific
    sd[a-z] is rejected by heat validation.
    
    See:
    http://docs.openstack.org/trunk/openstack-compute/admin/content/managing-volumes.html
    Search device name
    
    Resolves issue #71
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/volume.py |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit 4d432413e13f4cba88e9ed8a4f9ddd15925bc501
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 9 18:23:22 2012 +0200

    Allow sending events using metadata server
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/engine/manager.py           |   14 ++++++++++++++
 heat/metadata/api/v1/__init__.py |    3 +++
 heat/metadata/api/v1/metadata.py |    9 +++++++++
 3 files changed, 26 insertions(+)

commit 50d2ca8029619c1f13c990e76b579dc4a93cad40
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 9 17:02:28 2012 +0200

    Typo in a logging declaration
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/engine/wait_condition.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dd3d21ee9e8b3539584d8921c15284d66c46d7c7
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed May 9 09:45:15 2012 -0400

    Fix stack creation - CREATE_FAILED issue
    
    The stack creation call to validate the stack was resetting the
    stack template attribute.  I've made a copy of the stack purely
    for validation purposes.

 heat/engine/manager.py       |    6 +++++-
 heat/tests/test_resources.py |    3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

commit 1b903f8b7078f7b9cac29919c91bb5bb5904d0d2
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue May 8 17:39:08 2012 -0400

    Add ability to automate testing with tox.
    
    Install tox via easy_install. Tox automates the creation of multiple
    virtual environments, each of which can be used with a different
    interpreter or specific custom tests (and is what StackForge uses).
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 tox.ini |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

commit ee2076b2aa33cf1f3248e8d1052f52bd723762ac
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue May 8 14:41:21 2012 -0400

    Add option to exclude pep8 examination to run_test.sh.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 run_tests.sh |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit d8b3a3387bf35dca7742395d3b8095b2d6e35b04
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue May 8 11:31:25 2012 -0400

    Add test coverage option to run_tests.sh
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 run_tests.sh |   28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

commit 2733b9a5debb80066a2df1efe90f74f0dd0be6e7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 23:04:35 2012 +1000

    Connect up the waitcondition code to poll the metadata for the signal.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/wait_condition.py |  108 +++++++++++++++++++++++++++++++++--------
 1 file changed, 87 insertions(+), 21 deletions(-)

commit 41ae2e7995172854b7a981ea86422637c8227ddd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 22:04:04 2012 +1000

    Save to parsed template as that is used in the parser.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py |   25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

commit 23849cce1331b7c7fe3550000bcae08757db9ead
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 20:49:39 2012 +1000

    WaitCondition: fix the url to the new metadata server.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/wait_condition.py |   19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

commit f3c2d67cd5148e997e86f9b8f046f2d92a8854f4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 20:47:28 2012 +1000

    Add WaitConditions to HA template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_Single_Instance_With_HA.template     |   62 ++++++++++++++++----
 1 file changed, 49 insertions(+), 13 deletions(-)

commit 6d4a0dff6bac0b722e5a5ae769463b60e7451873
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 20:46:44 2012 +1000

    Download cfn tools from the master branch.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_Single_Instance_With_HA.template     |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 154442a3a6cb5333a1d9f1a8111977100985f0e7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 20:15:02 2012 +1000

    Escape the quotes going into cfn-signal shell command.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn-signal |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 62e7882e9e61df2017549e6edbe7b1b5a3238ca3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 18:58:36 2012 +1000

    More peppy fixes...
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn_helper.py      |    4 +++-
 heat/common/config.py            |    1 +
 heat/db/sqlalchemy/session.py    |    5 +++--
 heat/engine/instance.py          |    3 ++-
 heat/engine/parser.py            |    5 +++--
 heat/metadata/api/v1/metadata.py |   19 +++++++++++++------
 6 files changed, 25 insertions(+), 12 deletions(-)

commit f36197a872ca2de5676b44372cbb725674822b98
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 18:29:17 2012 +1000

    Add implementation to cfn-signal
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn-signal |   40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

commit c3b0fe9ff52a23e2253a295f86d61e580e75713e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 18:27:35 2012 +1000

    Fix undefined LOG variable in db.session
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/db/sqlalchemy/session.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit ffeda71756840a13640a101016967bd7ab5b1166
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 18:25:48 2012 +1000

    Remove unused "cloudinit_path" setup in resources.py
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |   13 -------------
 1 file changed, 13 deletions(-)

commit 7a28922d1e564182a901781f8055f4eb7bcb1405
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon May 7 18:25:03 2012 +1000

    Metadata: Add bind_host to the config
    
    This needs to be set to the nova interface to work.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat-metadata     |   11 +++++------
 heat/common/config.py |    3 ++-
 2 files changed, 7 insertions(+), 7 deletions(-)

commit fa55a6984205ce9356b7c533309380e8c9e1a696
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Sat May 5 03:01:31 2012 +0200

    Register metadata server's entry point with Engine
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 bin/heat-metadata      |   12 ++++++++++++
 heat/common/config.py  |    3 +++
 heat/engine/manager.py |    8 +++++++-
 heat/engine/parser.py  |    6 +++---
 4 files changed, 25 insertions(+), 4 deletions(-)

commit da366b43b91c380cea2f7e20b63e0e536b9fadcc
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Sat May 5 03:00:16 2012 +0200

    Remove obsoleted metadata files
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/metadata/api/v1/metadata.py |    3 --
 heat/metadata/db.py              |   64 --------------------------------------
 2 files changed, 67 deletions(-)

commit 9d69b204023eed196d4dd113d3378a0704d428dd
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri May 4 15:16:11 2012 +0200

    Connect metadata server to the engine via RPC
    
    Similarly to the way heat-api works, the engine does all the heavy lifting (db
    access, etc.) while the metadata server provides the API layer that communicates
    with the engine.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 bin/heat-metadata                |    2 ++
 heat/common/config.py            |    4 ++-
 heat/db/sqlalchemy/models.py     |   10 +++++++
 heat/engine/manager.py           |   59 ++++++++++++++++++++++++++++++++++++
 heat/metadata/api/v1/metadata.py |   61 ++++++++++++++++++++++----------------
 5 files changed, 109 insertions(+), 27 deletions(-)

commit 247266e7bc65550b87f90ecfb2cb1c5a9e5efc0b
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Fri May 4 14:53:17 2012 -0400

    Moving key validation into instance validate

 heat/engine/instance.py |   12 +++++++++++-
 heat/engine/manager.py  |   16 +++-------------
 heat/engine/parser.py   |    4 +---
 3 files changed, 15 insertions(+), 17 deletions(-)

commit 8bfacf2e2322ec440e752fe90e2eb7cf615c8f79
Author: Ian Main <imain@redhat.com>
Date:   Fri May 4 11:23:09 2012 -0700

    Apparently boto expects / to be list stacks.
    
    This patch just makes / redirect to list_stacks.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/api/v1/__init__.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9e2c35efa8df0ba3597b9f9e4e33b706eb86dbe9
Author: Steven Dake <sdake@redhat.com>
Date:   Fri May 4 10:09:41 2012 -0700

    ValidateTemplate API call framework
    
    This is a start on issue #111
    
    While no actual validation is done by this patch, this patch introduces
    the framework for validating in each of the resource types and returning
    an appropriate error when a validation error occurs.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat                      |   11 ++++++++++-
 heat/api/v1/stacks.py         |    6 +++++-
 heat/engine/eip.py            |    6 ++++++
 heat/engine/instance.py       |    6 ++++++
 heat/engine/manager.py        |   11 ++++++-----
 heat/engine/parser.py         |   24 +++++++++++++++++++++---
 heat/engine/resources.py      |    7 +++++++
 heat/engine/security_group.py |    6 ++++++
 heat/engine/volume.py         |    6 ++++++
 heat/engine/wait_condition.py |    6 ++++++
 10 files changed, 79 insertions(+), 10 deletions(-)

commit 6bae53753bff2bf1062a1fdea2ee5963e6ed6b65
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri May 4 11:21:55 2012 +1000

    Fix the sql in the rails template (didn't work with the mysql in f16)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/Rails_Single_Instance.template |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit d7c2c89a15d0a9cbdaa6dee920865b8cea21e327
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 3 17:45:18 2012 -0400

    uncommenting the metadata server attribute so the tests work

 heat/engine/parser.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3af0fb67db69204f941ff78a385b85972879898d
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 3 15:06:20 2012 -0400

    Validating the KeyName against nova on stack_create
    
    Fixes Issue #98

 heat/engine/manager.py |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit 47cf2132a27f85cccf779f070badc3cebbc37a3c
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu May 3 16:19:17 2012 +0200

    Connect cfn utils to the remote server
    
    The cfn_helper's `Metadata` class can now connect to the metadata server
    prodived it's URL is known and available.
    
    Engine will pass metadata server's URL via the User Data to the following file:
    
        /var/lib/cloud/data/cfn-metadata-server
    
    If the file doesn't exist or the server is unreachable, cfntools will read
    metadata from the `/var/lib/cloud/data/cfn-init-data` file as they did so far.
    
    Note that Engine dosen't currently know the metadata server's URL so it's not
    passing it to the instance yet.

 heat/cfntools/cfn_helper.py |   43 +++++++++++++++++++++++++++++++++++++++----
 heat/engine/instance.py     |   10 ++++++++--
 heat/engine/parser.py       |    3 ++-
 3 files changed, 49 insertions(+), 7 deletions(-)

commit 25568e75c335fb3deef534d17853c6496f9911c1
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu May 3 16:33:53 2012 +0200

    Fix cfn-get-metadata params and output
    
    Marked the `--stack` and `--resource` parameters as required and set it to
    actually write the metadata out.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/cfntools/cfn-get-metadata |   12 ++++++++++--
 heat/cfntools/cfn_helper.py    |    2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

commit 18eb501eb00779953ebbeebd97123648b49af02a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 23:26:25 2012 +1000

    Fixed the interpretation of the file extension.
    
    My initial lack of understanding of "is" and "==".
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn_helper.py |    8 ++++----
 heat/tests/test_cfn.py      |   14 ++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

commit 235112febe5e4d413ff8ca62ce22e9444974c1e5
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 3 09:10:13 2012 -0400

    Only showing the Outputs when the status of a stack is CREATE_COMPLETE
    
    This fixes issues #96

 heat/engine/manager.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 863f04af0e421ae88db35f9a452fff7d8196dc96
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 22:33:23 2012 +1000

    Fix unbound error in cfn_helper.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn_helper.py |    1 +
 1 file changed, 1 insertion(+)

commit 9f7fd58a3024e9215594a7f5ee08b8e9bf3b7450
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu May 3 08:15:08 2012 -0400

    Adding mime_string to the Instance instance and fixing tests

 heat/engine/instance.py      |   57 +++++++++++++-----------
 heat/tests/test_resources.py |  101 ++++++++++++++++++++++--------------------
 2 files changed, 83 insertions(+), 75 deletions(-)

commit c0b9519e49ad5dda2d92df2b22ff19a6afc365e2
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 22:01:09 2012 +1000

    Fix some indentation and pep errors
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn_helper.py   |   12 +++++++-----
 heat/engine/eip.py            |    2 --
 heat/engine/instance.py       |    1 -
 heat/engine/security_group.py |    2 --
 heat/engine/volume.py         |    1 -
 heat/engine/wait_condition.py |    6 ++++--
 heat/tests/test_cfn.py        |    5 +++--
 7 files changed, 14 insertions(+), 15 deletions(-)

commit 07148b41e7d8fb065c17eb7013927cae13d03bff
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 14:37:53 2012 +1000

    Hack the Rails template to work.
    
    - set the image name mapping
    - we don't have AWS::IAM::AccessKey yet
    - we don't have PublicDnsName yet
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/Rails_Single_Instance.template |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit c273624c021a95b08467b9d4fca6f2067ca38235
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 2 15:48:34 2012 +1000

    Add Rails template example
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/Rails_Single_Instance.template |  263 ++++++++++++++++++++++++++++++
 1 file changed, 263 insertions(+)

commit 59fb839acbf49d4820744012afcb5e56a0e0a837
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 14:34:57 2012 +1000

    Add dummy cfn-signal
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn-signal |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

commit cdcc931848f8dc09ce4ff85d9ea472220dff8769
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 14:34:39 2012 +1000

    Add WaitConditions
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py         |    5 ++
 heat/engine/wait_condition.py |  118 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+)

commit 20fc3c76a2f2e577af5eefc2640eb97a586593b1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu May 3 14:34:13 2012 +1000

    Split the resourses up into seperate files.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/eip.py            |  126 ++++++++++++
 heat/engine/instance.py       |  208 +++++++++++++++++++
 heat/engine/parser.py         |   22 +-
 heat/engine/resources.py      |  446 +----------------------------------------
 heat/engine/security_group.py |   98 +++++++++
 heat/engine/volume.py         |  128 ++++++++++++
 heat/tests/test_resources.py  |   59 +++---
 7 files changed, 606 insertions(+), 481 deletions(-)

commit 9de4d852dcc484485df5a47a17092f186fed3d1e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 2 15:44:38 2012 +1000

    Handle "sources" in cfn-init
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn_helper.py |   53 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

commit 9843bc8baae066643d556c1bc5600202338011a6
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed May 2 13:51:08 2012 +0200

    Initial metadata server API
    
    This implements the basic capabilities we need from the metadata server. Each
    API call returns proper HTTP responses (404, 409, etc.).
    
    The server is currently not connected to a real database. Rather, it uses a
    simple mock. This allows for quick initial API changes before things stabilize.
    
    The immediate next steps are to integrate the server with the cfn tools
    (cfn-metadata being the prime candidate) to see what may be wrong/missing.
    
    And then to connect the server to a real database.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/metadata/api/v1/__init__.py |   22 ++++++++++++-
 heat/metadata/api/v1/metadata.py |   63 +++++++++++++++++++++++++++++++++++--
 heat/metadata/db.py              |   64 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 146 insertions(+), 3 deletions(-)

commit c061dc0029517b7d8a346f8a8661f30620aed9ff
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed May 2 12:13:19 2012 +1000

    Add very basic support for installing (apt, python & gems)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn_helper.py |   38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

commit 67d5892ea96729b161e080914999236794949c53
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue May 1 14:48:16 2012 -0400

    Add cfn-get-metadata to files section of cfntools tdls
    
    Found while writing test for jeos creation
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/jeos/F16-i386-cfntools-jeos.tdl   |    1 +
 heat/jeos/F16-x86_64-cfntools-jeos.tdl |    1 +
 heat/jeos/F17-i386-cfntools-jeos.tdl   |    1 +
 heat/jeos/F17-x86_64-cfntools-jeos.tdl |    1 +
 4 files changed, 4 insertions(+)

commit b4cd790a8402c6cf8706765ff3a1767995f8b7d4
Author: Steven Dake <sdake@redhat.com>
Date:   Tue May 1 10:02:48 2012 -0700

    Modified README in tools directory to explain a few more tools
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/README |    8 ++++++++
 1 file changed, 8 insertions(+)

commit dc3c5bdf3db776cbabfce5e2ee3634c2f689f8f6
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue May 1 11:04:34 2012 -0400

    Scoping the session per thread (request).
    
    Fixes issue #94
    http://docs.sqlalchemy.org/en/rel_0_7/orm/session.html#sqlalchemy.orm.scoped_session

 heat/db/api.py                |    2 --
 heat/db/sqlalchemy/session.py |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

commit f7c1b3311d0fb5e9c0643830d81cd9f228402d64
Author: Ian Main <imain@redhat.com>
Date:   Mon Apr 30 15:03:39 2012 -0700

    Oops, meant for website repo.

 logo/heat_logo.svg |  415 ----------------------------------------------------
 1 file changed, 415 deletions(-)

commit 53a41bcfeb5dc7dd88604a89621bfe7284a1539f
Author: Ian Main <imain@redhat.com>
Date:   Mon Apr 30 14:57:38 2012 -0700

    Heat Logo
    
    SVG format of heat logo.

 logo/heat_logo.svg |  415 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 415 insertions(+)

commit 028f33397082ca3169ad5a0a975853df8a1e27e4
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 30 13:04:51 2012 -0400

    Skipping the import if its deps aren't installed, use --no-skip if you want to run this

 heat/tests/test_cfn.py |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

commit 1d706dd93efd8ed4c960a63b8e235b5537a92865
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 30 10:39:51 2012 -0400

    Copied the python-novaclient test code to avoid importing via python path

 .gitignore                   |    1 +
 heat/tests/fakes.py          |   71 ++++
 heat/tests/test_resources.py |    3 +-
 heat/tests/utils.py          |    5 +
 heat/tests/v1_1/fakes.py     |  816 ++++++++++++++++++++++++++++++++++++++++++
 heat/tests/v1_1/testfile.txt |    1 +
 heat/tests/v1_1/utils.py     |   29 ++
 7 files changed, 924 insertions(+), 2 deletions(-)

commit f10f5cf15b55c87f948196ad07a75e5b24142ab5
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 30 10:13:15 2012 -0400

    Adding the metadata.log file

 .gitignore |    1 -
 1 file changed, 1 deletion(-)

commit 908f572b34805c77b40c3890f2caa370561f8867
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Apr 27 16:44:11 2012 -0400

    Finish necessary changes related to jeos_create move
    
    As a result of moving jeos_create, the code is now used during test
    execution. The library libxml2 which was previously being used is not
    available in pip, so lxml has been swapped instead.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 bin/heat           |    2 +-
 heat/utils.py      |   12 +++++-------
 tools/pip-requires |    7 +++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

commit 4fa77a658c12b8caef72059ec645d04d80a8b639
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Apr 27 18:40:49 2012 +0200

    Add skeleton structure for the metadata server

 bin/heat-metadata                |   56 ++++++++++++++++++++++++++++++++++++++
 etc/heat-metadata-paste.ini      |   16 +++++++++++
 etc/heat-metadata.conf           |   25 +++++++++++++++++
 heat/common/config.py            |   11 ++++++++
 heat/metadata/api/v1/__init__.py |   36 ++++++++++++++++++++++++
 heat/metadata/api/v1/metadata.py |   36 ++++++++++++++++++++++++
 setup.py                         |    4 +++
 7 files changed, 184 insertions(+)

commit 669f312c9a80a5ce322b838ebe2b1656b292b888
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Apr 27 15:25:50 2012 +0200

    Update heat-api docstring

 bin/heat-api |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 524d214b84f2fe5c5e1df25989eed5860e59de0e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 13:12:33 2012 +1000

    more pep fixups.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn_helper.py     |   22 ++++++++++++++--------
 heat/db/api.py                  |    3 ++-
 heat/db/sqlalchemy/migration.py |    5 +++--
 heat/db/sqlalchemy/session.py   |    2 ++
 heat/engine/parser.py           |    1 -
 heat/rpc/__init__.py            |    1 +
 heat/tests/__init__.py          |    2 ++
 heat/tests/test_cfn.py          |   14 ++++++++------
 heat/tests/test_resources.py    |   37 ++++++++++++++++++-------------------
 9 files changed, 50 insertions(+), 37 deletions(-)

commit f7c677354261a78cacc1affab27ddb48a209ba6c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 13:02:58 2012 +1000

    Add cfn-get-metadata make all cfn tools more consistent
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn-get-metadata |   83 ++++++++++++++++++++++++++++++++++++++++
 heat/cfntools/cfn-hup          |   13 +++----
 heat/cfntools/cfn-init         |   32 +++++-----------
 heat/cfntools/cfn_helper.py    |    3 ++
 heat/utils.py                  |    4 +-
 5 files changed, 104 insertions(+), 31 deletions(-)

commit 1f141a6d041e9bbd6b7710c09c35cdd45f6fdab9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 10:21:43 2012 +1000

    openstack-common: timeutils and importutils seperated out
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/middleware/context.py       |    4 +-
 heat/common/context.py               |    4 +-
 heat/common/utils.py                 |   13 +----
 heat/common/wsgi.py                  |    3 +-
 heat/context.py                      |    3 +-
 heat/db/sqlalchemy/models.py         |    8 +--
 heat/openstack/common/importutils.py |   45 ++++++++++++++++
 heat/openstack/common/timeutils.py   |   73 ++++++++++++++++++++++++++
 heat/openstack/common/utils.py       |   93 ----------------------------------
 heat/rpc/__init__.py                 |    4 +-
 heat/service.py                      |    4 +-
 openstack-common.conf                |    2 +-
 12 files changed, 137 insertions(+), 119 deletions(-)

commit a9a6906a6ec0427112ee6137ff210cec9050d958
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 08:28:55 2012 +1000

    openstack-common: update cfg.py
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/openstack/common/cfg.py |   52 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 10 deletions(-)

commit d4f0c0d25b4d0d55b3dbe393fcc2fd8429d834c2
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Apr 26 16:51:00 2012 -0400

    Move jeos_create into utils so it can be imported
    
    The main reason for this move is so that jeos_create can be tested with
    the aide of Mox.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 bin/heat      |  260 ++++---------------------------------------------------
 heat/utils.py |  268 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 285 insertions(+), 243 deletions(-)

commit 2ba3934ce06b7c2d1c58d3347906c562063a9565
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 26 11:02:15 2012 -0700

    Put Starting Heat API in log file and add logging setup to bin/heat-api
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat-api |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 2a06886077c05e1bfae7c28a09cf3489da6e450a
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 26 10:55:23 2012 -0700

    Remove stray print debug message
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/utils.py |    1 -
 1 file changed, 1 deletion(-)

commit 87eca83a047a103529d2563a046e773705805f89
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 26 10:49:10 2012 -0700

    Quiet down the QPID logging since it isn't helpful and makes logs hard to read
    
    Should likely be removed later, but for the moment, logs readable without
    grep now.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/common/config.py |    3 +++
 1 file changed, 3 insertions(+)

commit a1908e501440b2505560fcb07b37a1ea26c92f16
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 26 10:29:26 2012 -0700

    Kill prints and replace with LOG in heat/rpc/__init__.py
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/rpc/__init__.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 10ef7521f5f9186d807699f7409fc4c2ceb0e8b5
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 26 17:29:42 2012 +0200

    Stub out system calls in metadata_files test
    
    Since CommandRunner now honours `runas`, the tests would have to be run as root
    for the commands to succeed.

 heat/tests/test_cfn.py |   49 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

commit 6b0d2d7827dedf553ac7d25cb75ebcacc7379532
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 26 17:27:25 2012 +0200

    Implement runas for cfn-hup
    
    As a side effect, this fixes #109. By running everything through `su -c`, all
    the piping and redirection issues are outsourced there.

 heat/cfntools/cfn_helper.py |    2 +-
 heat/tests/test_cfn.py      |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

commit 3802dfbba6f27df3c172bdb6ace261a7be998c49
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 00:32:15 2012 +1000

    Add test artifacts to gitignore
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .gitignore |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit f489c956c67240cfa3f3d5b8a4b54c9e7d4531e7
Merge: 1029566 fe8a57c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 00:22:24 2012 +1000

    Merge branch 'ha'
    
    Conflicts:
    	heat/db/sqlalchemy/session.py
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit fe8a57c9cfd0e29aae5bd1f913370434953a5d69
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 27 00:05:59 2012 +1000

    Handle cfn-hup non-value parameters
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn-hup |    2 ++
 1 file changed, 2 insertions(+)

commit 10295665615ae525caa06c42a3edf3b81db817b8
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 26 09:33:01 2012 -0400

    Moving db error wrapping into heat session to avoid a nova import

 heat/db/sqlalchemy/session.py |   26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

commit afb73a6e764819c953e17c0f181b8dd7f4ad8e1b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 23:16:59 2012 +1000

    Add an easier way to update the cfn scripts
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_Single_Instance_With_HA.template     |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit 1eb030408051afe71e306f501bcd94bd9dd8509f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 23:16:25 2012 +1000

    Fix up the template - some scripts not right.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_Single_Instance_With_HA.template     |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 51242e0802faad4c5c55765b68cfdd73c93bdf3b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 23:15:39 2012 +1000

    Fix the cfn logging
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn-hup  |    4 ++--
 heat/cfntools/cfn-init |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit ee56b0978e3fa4a3aea51f4257b769b9e48f139a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 22:51:38 2012 +1000

    Fix userdata mime creation
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit e5553b53d5ef72a135bc12f23a00561c76d9e119
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 22:51:38 2012 +1000

    Fix userdata mime creation
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 7151e579849263a73869c94d3ccd7f79a631d717
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 21:46:02 2012 +1000

    Add a real creds file for the cfn-hup config tests
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/tests/test_cfn.py |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

commit be49adb7fc2c0f0e25c98e6b842a5a0fad90542b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 21:45:01 2012 +1000

    Re-add the file logging to cfn tools.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn-hup  |   26 ++++++++++++++++----------
 heat/cfntools/cfn-init |    9 +++++++--
 2 files changed, 23 insertions(+), 12 deletions(-)

commit 9f9716f3d944aa7782727179c6001ff2b4b0b435
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 17:01:38 2012 +1000

    Make sure AWS::StackName is avaliable
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py |    4 ++++
 1 file changed, 4 insertions(+)

commit e5208d1d717e59a451ca3e4ac095990d466ae3c3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 17:01:13 2012 +1000

    Add cfn-hup config into template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_Single_Instance_With_HA.template     |   68 +++++++++++++++++++-
 1 file changed, 66 insertions(+), 2 deletions(-)

commit f03e90140461bef74468ff6ee5326b6ca9fea2d5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 14:13:56 2012 +1000

    Copy the single inst. wordpress template to With_HA
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_Single_Instance_With_HA.template     |  146 ++++++++++++++++++++
 1 file changed, 146 insertions(+)

commit 5d1a35fbf5c1a19b0aa65065a29eba3cd0f209b7
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 24 17:08:36 2012 -0400

    removing import of common config because it needs credentials

 heat/db/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 0fbe418d12d94c660c880a357ad3ce5a9b5211cd
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 24 16:53:31 2012 -0400

    Adding the nova.exeption import to fix the tree

 heat/db/sqlalchemy/session.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6d2f82aca047dd850c699fbd2178c910be39e041
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 26 14:07:12 2012 +1000

    Add file support to cfn-init
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn_helper.py |   80 +++++++++++++++++++++++++++++++++++++++----
 heat/tests/test_cfn.py      |   53 ++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+), 7 deletions(-)

commit cdd4d98862b14eded343413390cf05aa549b245f
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 25 10:46:27 2012 -0400

    Adding instance  delete test

 heat/tests/test_resources.py |   54 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

commit c227c4581a0b77b19db5ed5b13006d2656283433
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Apr 25 16:34:59 2012 +0200

    Log when cfn-hup couldn't restart a service
    
    `service.restarted` hooks are not run when the restart failed.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/cfntools/cfn_helper.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit febbc668bbe2b415c874696be98612625ef6237a
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 25 09:42:28 2012 -0400

    putting python-novaclient back in pip requires

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0a9d87e28ddebe77ee3be4399533214b80c377b0
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 25 09:39:39 2012 -0400

    Removing nova from pip requires

 heat/db/sqlalchemy/session.py |    3 ---
 tools/pip-requires            |    3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

commit 724b5f3902c2117040d21b830f7b276bb5dc4e1e
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 24 15:29:08 2012 -0700

    Make heat-db-setup generic enough to run on RPM or DEB distributions
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat-db-setup        |  257 ++++++++++++++++++++++++++++++++++++++++++++++
 bin/heat-db-setup-fedora |  229 -----------------------------------------
 setup.py                 |    2 +-
 3 files changed, 258 insertions(+), 230 deletions(-)

commit 83e6754c823bdba656c8073e24d4a696b1d7b592
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 24 17:32:17 2012 -0400

    Adding the nova module to the pip-requires

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit 3299dbecb989b249b47e08b3bce5e19e3553ab92
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 24 17:08:36 2012 -0400

    removing import of common config because it needs credentials

 heat/db/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 30482f729079b109caf7bc1c3c7e2a5853df4cf8
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 24 16:53:31 2012 -0400

    Adding the nova.exeption import to fix the tree

 heat/db/sqlalchemy/session.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 710e2bb5f8774b4b3f8130ae484c6d4f3856cab7
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Apr 24 14:48:38 2012 -0400

    Use pip package name, not the RPM one
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 tools/test-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 53446bb36edde490896aff3725b30a14d62c50fa
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Apr 24 14:17:40 2012 -0400

    Update virtual-env requires and documentation
    
    Document the necessitity to keep tools/*-requires up to date and add
    missing dependency.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 heat/db/sqlalchemy/session.py   |    1 -
 heat/tests/testing-overview.txt |    4 ++++
 tools/pip-requires              |    2 ++
 tools/test-requires             |    3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

commit 9b23e2dc355e9a6e4d7a1cd1dbd2bc89ff9c8ba1
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Apr 24 16:41:35 2012 +0200

    Make cfn-hup configuration handling closer to aws
    
    We now enforce the presence of the [main] configuration section, check that the
    credentials file exists and ensure that there is at least one hook defined.

 heat/cfntools/cfn-hup       |   15 ++++++++++++---
 heat/cfntools/cfn_helper.py |   14 ++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

commit 77935cb3d482ace4cd60183fca5131035a29a7ad
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Apr 24 14:56:15 2012 +0200

    Better error messages for cfn-hup configuration

 heat/cfntools/cfn-hup |   27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

commit 39a8bfc296c465694e851c7ca227d50754324617
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 24 13:57:51 2012 +1000

    more work on cfn-hup
    
    - correct the default config files
    - seperate out the monitoring of services
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn-hup       |   24 +++++++++++++--------
 heat/cfntools/cfn_helper.py |   50 ++++++++++++++++++++++++++++---------------
 heat/tests/test_cfn.py      |    9 ++++----
 3 files changed, 53 insertions(+), 30 deletions(-)

commit 6bf132f9098a24102e73851f4c7e08acea3493fa
Merge: 833fedb ed92ae3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 24 10:34:38 2012 +1000

    Merge remote-tracking branch 'origin/master' into ha

commit 833fedbfb3baa5da2faaf8a518d00e593f4ede55
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 24 10:32:58 2012 +1000

    Add test case for boolean.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/tests/test_cfn.py |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit ed92ae34715eead8c5a128f27d13af3599b16a29
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 23 16:37:09 2012 -0400

    Assert the instance auto increment on the id worked

 heat/tests/test_resources.py |    3 +++
 1 file changed, 3 insertions(+)

commit 6c0bcf0727094b9f988ec5ddc0d695c22862d402
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 23 14:47:44 2012 -0400

    Removing the run_tests.py, was replaced by heat/testing/runner.py

 run_tests.py |  278 ----------------------------------------------------------
 1 file changed, 278 deletions(-)

commit 841452f350447683a851151088ee5615d64c97b8
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 23 14:46:49 2012 -0400

    Changing version scheme to just major

 heat/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit bf859e6f4b69d35dbf496522d1e75e4cc3771507
Merge: c5ff641 29c0f9a
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 23 09:26:57 2012 -0400

    Merge branch 'resource_unit_tests'

commit 29c0f9a74f74c75478b81994d5a9f77ecf52f75e
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 19 19:24:28 2012 -0400

    Adding instance creation test
    
    Signed-off-by: Chris Alfonso <calfonso@redhat.com>

 heat/tests/test_resources.py |    5 -----
 1 file changed, 5 deletions(-)

commit 9a0ee86fc62372b3c4a99b705981fe653bdaa088
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Apr 23 15:10:33 2012 +0200

    Fix `to_boolean` in cfn_helper
    
    The lowercase conversion and striping whitespace from strings was being ignored.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/cfntools/cfn_helper.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c5ff64132a2c036740c9d45c5be00dc35e690a58
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 23 22:59:27 2012 +1000

    Try and keep track of the stack status.
    
    Ref: #93
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/db/sqlalchemy/models.py |    5 ++++-
 heat/engine/manager.py       |    6 ++----
 heat/engine/parser.py        |   29 +++++++++++++++++++++++++++--
 3 files changed, 33 insertions(+), 7 deletions(-)

commit 7b039d4a7523e3468c3bad7eeea6f30ddf428cca
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 19 18:10:20 2012 -0400

    Added db setup and teardown with sqlite

 heat/tests/test_resources.py |   29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

commit bad1eb37a5b3659e888a5840ed931aa11fc0e37b
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 18 09:03:17 2012 -0400

    Adding unit test for instance creation

 heat/tests/test_resources.py |   23 ++++++++++++++++++++++-
 run_tests.py                 |    1 -
 2 files changed, 22 insertions(+), 2 deletions(-)

commit 7f44cf82bf8255a336104ac40191e51a0aa7ec52
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 17 15:55:36 2012 -0400

    Adding resource initialization test

 heat/tests/test_resources.py |    2 +-
 run_tests.py                 |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 2af14f5abf1e57b3b9a27362f63ad7bb85b25be1
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 19 19:24:28 2012 -0400

    Adding instance creation test

 heat/engine/resources.py     |   57 +++++++++++++++++++++---------------------
 heat/tests/test_resources.py |   26 +++++++++++++------
 2 files changed, 48 insertions(+), 35 deletions(-)

commit bdaed9b99735b5e221d423f5e53a5113b1512b99
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 19 18:10:20 2012 -0400

    Added db setup and teardown with sqlite

 .gitignore                      |    1 +
 heat/common/config.py           |    2 -
 heat/db/api.py                  |   23 ++-
 heat/db/migration.py            |   31 ++++
 heat/db/sqlalchemy/migration.py |  111 ++++++++++++
 heat/engine/resources.py        |    3 -
 heat/testing/README.rst         |   60 +++++++
 heat/testing/fake/__init__.py   |    1 +
 heat/testing/runner.py          |  362 +++++++++++++++++++++++++++++++++++++++
 heat/tests/__init__.py          |   24 +++
 heat/tests/test_resources.py    |   79 ++++-----
 heat/utils.py                   |   26 +++
 run_tests.sh                    |   13 +-
 13 files changed, 674 insertions(+), 62 deletions(-)

commit 9c69836bfd49e2b8c7b84d0de9c44aa5c852373e
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 18 09:03:17 2012 -0400

    Adding unit test for instance creation

 heat/tests/test_resources.py |   27 +++++++++++++++++++++++++--
 run_tests.py                 |    1 -
 2 files changed, 25 insertions(+), 3 deletions(-)

commit 517d00fb8a749b6d912e1dab29fea9c28b1136da
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 17 15:55:36 2012 -0400

    Adding resource initialization test

 heat/tests/examples/test3.py |    2 +-
 heat/tests/test_resources.py |   55 ++++++++++++++++++++++++++++++++++++++++++
 run_tests.py                 |    1 +
 3 files changed, 57 insertions(+), 1 deletion(-)

commit 12797d82299b9e5698a25b6b7284642bed72ab79
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 23 19:54:11 2012 +1000

    Initial cfn-hup (wip)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/cfntools/cfn-hup       |   65 ++++++++++++++++++++++++++
 heat/cfntools/cfn-init      |    7 ++-
 heat/cfntools/cfn_helper.py |  107 +++++++++++++++++++++++++++++++++++++++++--
 heat/tests/test_cfn.py      |   75 ++++++++++++++++++++++++++++++
 4 files changed, 249 insertions(+), 5 deletions(-)

commit 2019dec757321ae3dae3e32ac63f352df5a534a4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 23 13:08:32 2012 +1000

    Move common cfn code into cfn_helper.py
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat                               |    2 +-
 heat/cfntools/cfn-init                 |  542 +------------------------------
 heat/cfntools/cfn_helper.py            |  546 ++++++++++++++++++++++++++++++++
 heat/jeos/F16-i386-cfntools-jeos.tdl   |    1 +
 heat/jeos/F16-x86_64-cfntools-jeos.tdl |    1 +
 heat/jeos/F17-i386-cfntools-jeos.tdl   |    1 +
 heat/jeos/F17-x86_64-cfntools-jeos.tdl |    1 +
 7 files changed, 561 insertions(+), 533 deletions(-)

commit e67e9c80bf8369314378268cb0b988be0c45c115
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 23 12:04:46 2012 +1000

    Fix more pep8 errors.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat                     |   70 +++++++++++++++++++++++++++++-------------
 bin/heat-engine              |    3 +-
 heat/db/sqlalchemy/api.py    |    3 +-
 heat/db/sqlalchemy/models.py |    1 -
 heat/engine/manager.py       |    9 ++++--
 heat/engine/parser.py        |    4 +--
 6 files changed, 61 insertions(+), 29 deletions(-)

commit 3323d045d2af05c0bf9ecdf59980f70cb24fd6ae
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 22 18:39:11 2012 -0700

    Update version to v3
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 87dac3d2c05d6f232c789878a58e85abdec39160
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 14:48:59 2012 -0700

    Wordpress 2 instance with EBS and EIP
    
    srs.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../WordPress_2_Instances_With_EBS_EIP.template    |  254 ++++++++++++++++++++
 1 file changed, 254 insertions(+)

commit dfeb65185bc1349a4b19466eb7056f28cea4f15e
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Apr 20 20:54:04 2012 +0100

    heat cli : Add bash_completion.d entry for heat
    
    issue #87 Adds basic bash smart-complete script for heat to bash_completion.d
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 etc/bash_completion.d/heat |   18 ++++++++++++++++++
 setup.py                   |    1 +
 2 files changed, 19 insertions(+)

commit 831078ad28cc55904a7f018840c7c2b3ea7db1c8
Author: Steven Hardy <shardy@redhat.com>
Date:   Fri Apr 20 20:42:29 2012 +0100

    heat cli: Use python logging module
    
    Issue #88 : Adds support for logging via the python logging module
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat |  105 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 60 insertions(+), 45 deletions(-)

commit a9e9fa9782c10f71f33be3ad08775ee955dfbe00
Author: Ian Main <imain@redhat.com>
Date:   Fri Apr 20 11:49:13 2012 -0700

    Fix another print -> logger.warn.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/parser.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit df69c7d2a5a9fb4c8f773ba3fcc6da5eff7e5e71
Author: Ian Main <imain@redhat.com>
Date:   Fri Apr 20 11:45:07 2012 -0700

    resources.py had a bunch of print's in it.
    
    This patch removes all the print statements and puts in proper logging
    statements.  Some of these (db tracebacks) are now logged as warnings.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/resources.py |   46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

commit 2f880bc61c4ccb7751003cede3d16f7e6fb6ee7a
Author: Ian Main <imain@redhat.com>
Date:   Fri Apr 20 11:38:59 2012 -0700

    Add an exception around EIP fetching.
    
    I was getting a traceback here causing the whole 'heat describe' to
    return an error when really it was just the one aspect failing.  Use
    try/rescue and log a warning.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/resources.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit df5dee4e0b78254c5b0c589bcbd4d9625f7aee2b
Author: Ian Main <imain@redhat.com>
Date:   Fri Apr 20 11:07:36 2012 -0700

    Fix a typo in the command line help.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 bin/heat |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fe5ebdbde1a81e4920c9f906fcfbe7fbb068b7c2
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 10:43:18 2012 -0700

    Use v1 / v2 / v3 for version numbers to match tags
    
    In the next several months since we wont be supporting maintenance releases,
    Just use v1/v2/v3/v4 for releases to match our tags.
    
    We can switch to an x.y.z or openstack style versioning when appropriate
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/version.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f04ba8797624f9d43999572d74dab320118bd627
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 10:36:18 2012 -0700

    Set proper author and mailing list in setup.py
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 setup.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b5eec2832d4d94efe1fb21deeaedbe6ae7310cf4
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 10:31:39 2012 -0700

    Remove BUILDING.rst since there is no building taking place inside project
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 BUILDING.rst |   29 -----------------------------
 1 file changed, 29 deletions(-)

commit 262e6066322a79eaba825e63a8cb59033d2d03fd
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 10:29:51 2012 -0700

    Remove rpm spec file and Makefile.  Will track packaging in a different repo
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 Makefile  |   84 -------------------------------
 heat.spec |  168 -------------------------------------------------------------
 2 files changed, 252 deletions(-)

commit 1816791ad4f54f6deefac9a70737bd06b2f425be
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Apr 20 10:28:55 2012 -0700

    Remove tito - likely track this in a different repo
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 rel-eng/packages/.readme |    3 ---
 rel-eng/packages/heat    |    1 -
 rel-eng/tito.props       |    5 -----
 3 files changed, 9 deletions(-)

commit b1802fe7ab0458ca381fbc5214cbf27918bafd9c
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 19 18:23:56 2012 +0200

    Fix the EIP cleanup
    
    Fixes #69
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/engine/resources.py |    1 -
 1 file changed, 1 deletion(-)

commit 753b34deb9d7e3514a11ee138b9f6d165a961044
Author: Ian Main <imain@redhat.com>
Date:   Wed Apr 18 13:25:44 2012 -0700

    Add documentation for the per command CLI help options.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 bin/heat |   70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 62 insertions(+), 8 deletions(-)

commit 39f822f04ff67dd05be0dec595fa7cfa30f4e622
Author: Steven Hardy <shardy@redhat.com>
Date:   Wed Apr 18 20:47:03 2012 +0100

    heat, heat-api: Add missing licence to header
    
    Adds missing licence header to heat and heat-api
    
    Signed-off-by: Steven Hardy <shardy@redhat.com>

 bin/heat     |   12 ++++++++++++
 bin/heat-api |   12 ++++++++++++
 2 files changed, 24 insertions(+)

commit 2a766dfcc132b0a066a88bf16cf463437599038c
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Apr 18 15:17:51 2012 -0400

    Remove rootpw from tdls and add ec2-user to sudoers file
    
    Fixes #72
    Fixes #73
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 bin/heat                               |    2 ++
 heat/jeos/F16-i386-cfntools-jeos.tdl   |    3 +--
 heat/jeos/F16-i386-gold-jeos.tdl       |    1 -
 heat/jeos/F16-x86_64-cfntools-jeos.tdl |    3 +--
 heat/jeos/F16-x86_64-gold-jeos.tdl     |    1 -
 heat/jeos/F17-i386-cfntools-jeos.tdl   |    3 +--
 heat/jeos/F17-i386-gold-jeos.tdl       |    1 -
 heat/jeos/F17-x86_64-cfntools-jeos.tdl |    3 +--
 heat/jeos/F17-x86_64-gold-jeos.tdl     |    1 -
 9 files changed, 6 insertions(+), 12 deletions(-)

commit 7921648911a91d1f40be3b353bb57887fed3b783
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 18 12:29:52 2012 -0400

    Deleting parsed and raw template when deleting stacks

 heat/db/sqlalchemy/api.py    |   12 +++++++++++-
 heat/db/sqlalchemy/models.py |   11 ++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

commit fc77b204f84f54b381ec08f9f1bc315fbdf61c5b
Author: Ian Main <imain@redhat.com>
Date:   Wed Apr 18 08:53:54 2012 -0700

    A little more detail on network create.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 tools/openstack |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 6e9acd83abc0416978f4e4d4dcc81dfe148de679
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Apr 18 11:29:48 2012 +0200

    Fix the test environment
    
    Made sure that `run_tests.sh` works properly (it was failing on the heat/bin
    directory) and that all tests pass and the generated logs are .gitignored.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 .gitignore               |    1 +
 heat/engine/resources.py |    1 -
 run_tests.sh             |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

commit eac075e5e1feb18610e9f049430a900c6f3d6120
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 16:16:32 2012 +1000

    Fix another template attribute in the output section
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_Single_Instance_With_EBS.template    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3e7499aea7d710602ddaef498f201dbeb6c1c834
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 16:15:47 2012 +1000

    Use the correct api to get the volume object.
    
    It must be volume not nova. But nova is used for the attachment.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 770224c0502138d5d15b031676a354c4cee22a42
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 16:14:24 2012 +1000

    Save the resource if complete or failed
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    2 ++
 1 file changed, 2 insertions(+)

commit 777d2f3a567c0e32eb3fcea6936ccf6787faa09f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 15:47:21 2012 +1000

    Fix the delete of a volume attach when the create partially succeeded
    
    Fixes #70
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

commit 24ad425a7af57017e3167cebaaa0fe19173a3d14
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 15:08:47 2012 +1000

    To properly populate the output section.
    
    We need to get ipaddresses which are lost as they are
    not stored in the template so we need to retrieve them
    at runtime.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py    |    6 ++++--
 heat/engine/resources.py |   36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

commit 89e86fa918302c297fca7057144ae7798dd05088
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 14:45:22 2012 +1000

    Use the instance_id for the event "physical_resource_id"
    
    Just to provide a bit more info.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9e79551d7724d3dd89c2c09a9aaefacacd69c7d9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 14:44:08 2012 +1000

    Fix the output attribute in single instance wp template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/WordPress_Single_Instance.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 35bd5f4c5f21e375f828377b7ea37ec1b93c6d96
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 14:43:18 2012 +1000

    Save the parsed_template so user parameters are available.
    
    This caused parsing errors when deleting, as required
    references were not available.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py   |   22 ++++++++++++++++------
 heat/engine/parser.py    |   33 +++++++++++++++++++++++++++------
 heat/engine/resources.py |    1 +
 3 files changed, 44 insertions(+), 12 deletions(-)

commit e5a0f9196f0f4f55887b5a96e595d710e78d0ba1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 14:02:25 2012 +1000

    Fix the parsed_template columns (missing created_at and updated_at)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../migrate_repo/versions/003_add_missing_cols.py  |   18 ++++++++++++++++++
 heat/version.py                                    |    2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

commit 8a317678cf7a4e846141b54e881fb19ecb7b4220
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 18 12:25:16 2012 +1000

    Fix the version file (don't import glance's git commit)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/version.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 358920e1369246d12a92ce60770844145581aab1
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 17 10:12:04 2012 -0700

    Add WordPress_Single_Instance_With_EBS_EIP.template
    
    This template uses EBS, EIP, security groups in a single instance.
    Unfortunately because of issue #83 the template doesn't fully start.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 ...WordPress_Single_Instance_With_EBS_EIP.template |  214 ++++++++++++++++++++
 1 file changed, 214 insertions(+)

commit 991b3fd18d5a0fc4056b94db801b5a3b3178a395
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 17 09:36:31 2012 -0700

    Rename EBS_Volume to just EBS to pave way for EBS_EIP
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_2_Instances_With_EBS.template  |  218 ++++++++++++++++++++
 .../WordPress_2_Instances_With_EBS_Volume.template |  218 --------------------
 .../WordPress_Single_Instance_With_EBS.template    |  189 +++++++++++++++++
 ...dPress_Single_Instance_With_EBS_Volume.template |  189 -----------------
 4 files changed, 407 insertions(+), 407 deletions(-)

commit 83e002fd3bbc4e7a62d9940d4eff3c3c26cd1218
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 17 09:30:21 2012 -0700

    Make WordPress_Single_Instance_With_EIP.template work
    
    Note I receive an exception in engine.log:
    ClientException: Associate floating ip failed (HTTP 500)
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../WordPress_Single_Instance_With_EIP.template    |   41 ++++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

commit bf68a800e59ee3dc37ea2509048b8ddb6f3af4de
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 17 09:06:16 2012 -0700

    Initialize sec to None to avoid exception in security group
    
    When an existing security group is not found in nova, heat will trigger
    an exception and the stack won't be created.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |    1 +
 1 file changed, 1 insertion(+)

commit 7afbd05da3fd24b9c825531d1a1c562e31189c53
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 17 18:04:04 2012 +0200

    Fix invalid JSON in template
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 templates/WordPress_Single_Instance.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4993b5dfa0d3b09e3f1ed2b6dc4327054effd1c8
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 17 17:38:48 2012 +0200

    Store all event data in DB
    
    Fixes #64
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 .../migrate_repo/versions/002_Add_event_data.py    |   24 ++++++++++++++++++++
 heat/db/sqlalchemy/models.py                       |    6 +++++
 heat/engine/manager.py                             |   15 +++++++-----
 heat/version.py                                    |    4 ++--
 4 files changed, 41 insertions(+), 8 deletions(-)

commit c2ab4a39d136949db5d2e6c6c2b90930929fe087
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 17 17:38:48 2012 +0200

    Remove hard-coded paths from DB setup script
    
    Since versions of heat can and will change, we do not want want them
    hard-coded in the DB setup script. Instead, use the Python import logic to
    determine the location of the module.
    
    This will use the local copy of heat (which is usually what you want) if
    run from the top level of the repository. Otherwise it will use the
    installed version, as determined by Python.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-db-setup-fedora     |   13 ++-----------
 heat/db/sqlalchemy/manage.py |    6 +++++-
 2 files changed, 7 insertions(+), 12 deletions(-)

commit d4fda0273580fc8575298614bc90569a73c1d5b3
Author: Zane Bitter <zbitter@redhat.com>
Date:   Tue Apr 17 17:38:48 2012 +0200

    Avoid printing exception in db-setup
    
    If the db-setup is run multiple times without dropping the database, the
    attempt to set up version control again causes an exception. Since this is
    an expected condition, just print a message and exit normally.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-db-setup-fedora     |    2 +-
 heat/db/sqlalchemy/manage.py |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

commit f94547743e8b28203e34dd7c3534473ebb1babde
Author: root <root@zbitter.fedora>
Date:   Tue Apr 17 17:38:48 2012 +0200

    Handle exception on Ctrl-C
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/rpc/amqp.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 27832d617e34a1d6a290437a76e397526e039291
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 17 07:12:21 2012 -0700

    Updated WordPress_Single_Instance.template to work properly.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_Single_Instance.template |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

commit 08ad2beab0d0cb30283f8e210a42a707210a1e3a
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 20:45:26 2012 -0700

    Update templates README with list of secure vs insecure templates
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/README |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 9e2f208bffebb4434c74ca558e394aa93226feaf
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 20:43:28 2012 -0700

    Make WordPress_Single_Instance_With_EBS_Volume.template functional
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 ...dPress_Single_Instance_With_EBS_Volume.template |  114 +++++++++++++++-----
 1 file changed, 89 insertions(+), 25 deletions(-)

commit 8c7e46f4e6c4f5fbf2a7550f52690a7817750ea4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 17 12:09:30 2012 +1000

    remove old experimental code
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/run-parser.py            |   66 ------------------------------------------
 tools/README                 |    4 ---
 tools/experimental_create.py |   63 ----------------------------------------
 3 files changed, 133 deletions(-)

commit 0c93a40b604536507f308d901fb6c4e752c0ced8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 17 11:58:57 2012 +1000

    kill all pep8 errors in parser and resources
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/db/sqlalchemy/api.py       |    3 +-
 heat/engine/parser.py           |   26 +++++++-------
 heat/engine/resources.py        |   71 ++++++++++++++++++++++++---------------
 heat/rpc/impl_qpid.py           |   10 +++---
 heat/tests/examples/__init__.py |    1 +
 heat/tests/examples/test1.py    |    4 +--
 heat/tests/examples/test2.py    |    2 +-
 heat/tests/examples/test3.py    |    2 +-
 8 files changed, 71 insertions(+), 48 deletions(-)

commit dbfe16ff00be38a76505e492463b2fde154a0e58
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:46:27 2012 -0700

    Updated templates/README directory to more clearly explain templates
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/README |   46 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

commit 2da09c064a4c5c7d037d5f640488a9f6f468d39a
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:36:57 2012 -0700

    Rename WordPress_Single_Instance_cfntools.template to not have cfntools in name
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_Single_Instance.template       |  149 ++++++++++++++++++++
 .../WordPress_Single_Instance_cfntools.template    |  149 --------------------
 2 files changed, 149 insertions(+), 149 deletions(-)

commit eca8d5aa8bb24f99a64b824925344756b5b02e67
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:36:22 2012 -0700

    Rename WordPress_Single_Instance.template to have gold in name
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_Single_Instance.template      |  148 ---------------------
 templates/WordPress_Single_Instance_gold.template |  148 +++++++++++++++++++++
 2 files changed, 148 insertions(+), 148 deletions(-)

commit b5bf88aab524ed0ba199af6d1db9f45d9424258b
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:34:53 2012 -0700

    Adjust cfn-init -f flag to be implicit
    
    Fixes issue #75 for WordPress_Single_Instance_cfntools.template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../WordPress_Single_Instance_cfntools.template    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 162826f9d713a8116fbfe832a3e3bc7380cdb4c7
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:33:45 2012 -0700

    Adjust cfn-init to not use -f option
    
    Fixes issue #75 for WordPress_2_Instances_With_EBS_Volume.template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../WordPress_2_Instances_With_EBS_Volume.template |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 71f884272a39b0b6d301ee7f265db753b36ed2d7
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:32:09 2012 -0700

    Adjust cfn-init to not take a parameter in the initialization
    
    WordPress_2_Instances.template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_2_Instances.template |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 95d583fd79a5e6e65d8effcc0589f7361a0447c1
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 16:29:35 2012 -0700

    Fix bug in path on cfn-init
    
    Fixes issue #75
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/cfntools/cfn-init |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 64c654f71c12b6c230ce4286441f3b98b9625159
Author: Greg Blomquist <gblomqui@redhat.com>
Date:   Mon Apr 16 17:27:43 2012 -0400

    Fix for issue #75: no more -f in cfn-init
    
    Removed -f in cfn-init.  Instead, cfn-init reads resource metadata from
    /var/lib/cloud/data-cfn-init-data.
    
    Also, added logging.  cfn-init now logs to stdout and to /var/log/cfn-init.log

 heat/cfntools/cfn-init |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

commit 20e10f2bf788cb1a73488755c3d6d6718e11f871
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 14:12:19 2012 -0700

    gold plating the WordPress_2_Instances template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_2_Instances.template |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 6046cb1bdd81a68fffd1596b111f458a27548c86
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 16 13:51:50 2012 -0700

    Wordpress 2 with EBS working
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../WordPress_2_Instances_With_EBS_Volume.template |  183 ++++++--------------
 1 file changed, 55 insertions(+), 128 deletions(-)

commit 6b48e317b2dbac3794f801020c3199eae13034e6
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 16 13:46:58 2012 -0400

    Resolving rpmlint errors and adding man pages.
    
    Fixes #67

 Makefile                    |    2 +-
 docs/man/man1/heat-api.1    |   43 +++++++++++++++++++++++++++++++++++++++++++
 docs/man/man1/heat-engine.1 |   43 +++++++++++++++++++++++++++++++++++++++++++
 docs/man/man1/heat.1        |    4 ++--
 heat.spec                   |   19 +++++++++++++++----
 heat/cfntools/cfn-hup       |    1 +
 heat/cfntools/cfn-signal    |    1 +
 heat/common/config.py       |    1 -
 heat/common/crypt.py        |    1 -
 9 files changed, 106 insertions(+), 9 deletions(-)

commit 8423294a43b5b8db001acf157e179cc5e174bb21
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Apr 16 16:35:08 2012 +0200

    Register security group with launched instances
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/engine/resources.py |    3 +++
 1 file changed, 3 insertions(+)

commit b26a067626d5809381207a6ecafa0a3793e254fd
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Apr 16 15:10:31 2012 +0200

    Fix creation of security group and rules
    
    When the group or rule already exists, The Nova API and client errored out.
    
    Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

 heat/engine/resources.py |   28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

commit dfe12cbaba575620efac009597461a80110db9c9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 16 17:07:07 2012 +1000

    Fix a heap of pep8 errors
    
    ./run_tests.sh is much cleaner now.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/run-parser.py                                  |    3 +-
 heat/api/v1/__init__.py                            |    9 +-
 heat/api/v1/stacks.py                              |   20 +++--
 heat/cloudformations.py                            |    6 +-
 heat/cloudinit/part-handler.py                     |    9 +-
 heat/common/config.py                              |    5 +-
 heat/common/exception.py                           |   15 +++-
 heat/common/utils.py                               |    5 +-
 heat/db/api.py                                     |   22 ++++-
 heat/db/sqlalchemy/api.py                          |   32 ++++++--
 heat/db/sqlalchemy/manage.py                       |    3 +-
 .../migrate_repo/versions/001_norwhal.py           |   17 ++--
 heat/db/sqlalchemy/models.py                       |   24 ++++--
 heat/db/sqlalchemy/session.py                      |    2 +
 heat/engine/__init__.py                            |    1 -
 heat/engine/manager.py                             |   14 ++--
 heat/engine/parser.py                              |   86 +++++++++-----------
 heat/engine/resources.py                           |   80 +++++++++++-------
 heat/manager.py                                    |    2 -
 heat/rpc/__init__.py                               |    3 +-
 heat/rpc/impl_qpid.py                              |    5 +-
 heat/service.py                                    |    5 +-
 heat/tests/examples/test1.py                       |    5 ++
 heat/tests/examples/test2.py                       |    4 +
 heat/tests/examples/test3.py                       |    4 +
 25 files changed, 248 insertions(+), 133 deletions(-)

commit b7b29add1128861056e26b368e3e181ccd8fdbd3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 16 15:37:26 2012 +1000

    Make an attempt at passing exception messages from engine to cli.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py    |   40 +++++++++++++++++++++++++++++++---------
 heat/common/client.py    |    2 +-
 heat/common/exception.py |    4 +++-
 heat/engine/parser.py    |   18 ++++++++----------
 heat/engine/resources.py |   10 ++++------
 5 files changed, 47 insertions(+), 27 deletions(-)

commit 65b1ed9e89c8bb493867090812c35ce0f5b78e8d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 16 13:36:07 2012 +1000

    Fix 'heat describe'
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fe9b29dd3e1a150677fdb72f5b12db94c1b63609
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 20:51:46 2012 -0700

    Add a traceback on exception caught
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/parser.py |    3 +++
 1 file changed, 3 insertions(+)

commit f7d0e0572c63954727866733bcd08bec24c5579d
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 19:13:12 2012 -0700

    Add a README to the templates directory to aid in navigation of the templates
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/README |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit aa02d3270e7611094f2a2f38601dc5d312585425
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 18:53:39 2012 -0700

    Add a tools/heat-db-drop script for fatal error recovery
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/heat-db-drop |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 67c6131536ca102eec6ad69a73fca874fd8cc2ad
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 17:44:10 2012 -0700

    Make Wordpress_2_Instances.template work properly
    
    note the mysql instance is not secure because both IPs must be known
    ahead of time.  To resolve this problem, we will be using elastic IPs.
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_2_Instances.template |   46 ++++++++++++++----------------
 1 file changed, 21 insertions(+), 25 deletions(-)

commit 2f858e656c5527877793d0c76c9e9420c2edc080
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 16 10:00:39 2012 +1000

    Check errors better in resolve_attributes()
    
    Add a little more debug.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py    |    7 ++++++-
 heat/engine/resources.py |    1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

commit 814dee93f14a85908d3fab3263f94485540cd8fa
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 11:12:42 2012 -0700

    Add yum-plugin-fastestmirror on F17-x86_64 cfntools image
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F17-x86_64-cfntools-jeos.tdl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4592c434099a62ac55f1a4da8a523e6d20bc5ea9
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 11:10:50 2012 -0700

    Add yum-plugin-fastestmirror to the cfntools images
    
    Should speed up the downloading of packages on launch
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-i386-cfntools-jeos.tdl   |    2 +-
 heat/jeos/F16-x86_64-cfntools-jeos.tdl |    2 +-
 heat/jeos/F17-i386-cfntools-jeos.tdl   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit ede22be715255eb2f15e2808c94bbec8367e0dbd
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 15 10:28:52 2012 -0700

    Update WordPress_2_Instances.template to use cfntools and cfn-init
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_2_Instances.template |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 365b525dc4ae09b848a38cf94d4ef9cb87513efe
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 09:36:33 2012 -0700

    resources: remove insert_package_and_services
    
    Now that we have cfn-init, this hackery is no longer needed
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |   58 +---------------------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

commit 730ae9470eea526895ec7349978d945db3b1309d
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 08:10:38 2012 -0700

    Properly launches a cfntools image with the appropriate userdata mime blob
    
    Note that cfn-init should be run as follows in the userdata script
    
    /opt/aws/bin/cfn-init -f /var/lib/cloud/data/cfn-init-data
    
    This will install the appropriate RPMS and enable them
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |   48 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

commit be21044ef82c3962034ade2af93194ddb03445ee
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 07:57:06 2012 -0700

    Correct path to cfninit data
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../WordPress_Single_Instance_cfntools.template    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 05f4df48930f8b723bfa41f4d59e2b8b0089acb4
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 07:34:08 2012 -0700

    Yet more typos in cfntools template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../WordPress_Single_Instance_cfntools.template    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2d9253b07601c7cad3e21da5ead832171d52b637
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 07:27:15 2012 -0700

    Fix typo in template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../WordPress_Single_Instance_cfntools.template    |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c43659dd7ae6800ac25f477f9896aaa2ab69ca9a
Author: Steven Dake <sdake@redhat.com>
Date:   Sat Apr 14 07:23:20 2012 -0700

    Add a cfn-init call to cfntools
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../WordPress_Single_Instance_cfntools.template    |    1 +
 1 file changed, 1 insertion(+)

commit 60db42c27cd9ac2aa44153560fd276c7dfad2199
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Sat Apr 14 08:15:22 2012 -0400

    Automatic commit of package [heat] release [0.0.1-1].

 rel-eng/packages/heat |    1 +
 1 file changed, 1 insertion(+)

commit 6b098b82cebedd9946f015ebdc050110064f2d81
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Sat Apr 14 08:12:14 2012 -0400

    Adding instructions on building the project with tito

 BUILDING.rst |   29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit 8f201423b2378657555de67cdc27c15eb1d58821
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Sat Apr 14 07:58:27 2012 -0400

    Removing the PKG-INFO and vcsversion.py from the rpm

 heat.spec |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 65e62a6a7fdb888c4b900746b3f1195ded299764
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Fri Apr 13 16:05:40 2012 -0400

    Initialized to use tito.

 rel-eng/packages/.readme |    3 +++
 rel-eng/tito.props       |    5 +++++
 2 files changed, 8 insertions(+)

commit 2f8e95baecfb312bb93c93ddd020ee13f0e94120
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Fri Apr 13 17:10:30 2012 -0400

    Add unit test framework nose and associated helper scripts
    
    For usage documentation, refer to heat/tests/testing-overview.txt.
    run_tests.sh is what runs the tests.
    
    Fixes #44
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 contrib/redhat-eventlet.patch            |   16 ++
 heat/tests/examples/__init__.py          |    5 +
 heat/tests/examples/tags.txt             |    2 +
 heat/tests/examples/test1.py             |   32 ++++
 heat/tests/examples/test2.py             |   26 ++++
 heat/tests/examples/test3.py             |   25 +++
 heat/tests/testing-overview.txt          |  122 +++++++++++++++
 heat/tests/unit/test_template_convert.py |   41 -----
 run_tests.sh                             |   28 +++-
 tools/install_venv.py                    |  246 ++++++++++++++++++++++++++++++
 tools/pip-requires                       |   16 ++
 tools/test-requires                      |    8 +
 tools/with_venv.sh                       |    4 +
 13 files changed, 524 insertions(+), 47 deletions(-)

commit b070322351d4c03401ce80d31388dbf89351b181
Author: Ian Main <imain@redhat.com>
Date:   Fri Apr 13 13:29:57 2012 -0700

    Document all methods in the EngineManager class. These ones seem important.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/manager.py |   49 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

commit d3dfb7f15a69904417b516bb84edc4c6e12c392f
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Fri Apr 13 15:59:12 2012 -0400

    Updating the heat spec to pull in cloudinit files and i386 jeos templates

 heat.spec |    5 +++++
 1 file changed, 5 insertions(+)

commit f0862d8b882beba4a698ddc554f1f263bba0039d
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Fri Apr 13 15:01:41 2012 -0400

    renaming CloudFormations to CloudFormation

 README.rst               |    2 +-
 bin/heat                 |    2 +-
 bin/heat-api             |    2 +-
 heat/cfntools/README     |    4 ++--
 heat/cfntools/cfn-hup    |    2 +-
 heat/cfntools/cfn-init   |    2 +-
 heat/cfntools/cfn-signal |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

commit 4b04ffd16a909332f11aeb552c25893e856068cb
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 17:58:23 2012 +0200

    Handle errors when listing events
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/api/v1/stacks.py     |   14 +++++---------
 heat/db/sqlalchemy/api.py |    9 ---------
 heat/engine/manager.py    |    3 +++
 3 files changed, 8 insertions(+), 18 deletions(-)

commit 0525333416283fa02c86fc17693c23d53c984f1e
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 17:58:23 2012 +0200

    Show stack description when status is unknown
    
    Apply the same improvement that d41193cbff97caf68a5eaa5b105593af17e3339d
    made for list_stacks to show_stack.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 5c69b6087aa647260dcb87a2ed3936f9eb7b6a47
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 17:58:23 2012 +0200

    Allow listing of all events
    
    Make filtering by StackName optional.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat               |    4 +---
 heat/api/v1/stacks.py  |    3 ++-
 heat/engine/manager.py |    8 ++++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

commit 3cbb97ad00413910bb3d06ef5ad3af8a3b7c1164
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Apr 13 15:56:29 2012 +0200

    Use security groups in the multi-instance wp template

 .../WordPress_2_Instances_With_EBS_Volume.template |   39 ++++++++++++++++++++
 1 file changed, 39 insertions(+)

commit d41193cbff97caf68a5eaa5b105593af17e3339d
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Apr 13 14:43:07 2012 +0200

    Fix listing stacks
    
    `heat list` was failing for non-empty stacks because the `Stack` model had no
    `template` attribute.
    
    Also fixed an issue where we didn't show the template description when the
    stack status was unknown.

 heat/engine/manager.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 957a45c32eeaf5a9136215df06da2658d815534e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 20:15:23 2012 +1000

    Fix the stack.delete() by populating the resource id/state from the db.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |   48 +++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 18 deletions(-)

commit 4d1b1394cfc319efc52f896d78c92314ea4b3406
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 20:13:09 2012 +1000

    move the db stack delete into parser.py as it is non-blocking.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py |    1 -
 heat/engine/parser.py  |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 90a67a73636e12c46da2ce9947ae415f0c488a38
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 17:23:29 2012 +1000

    Cleanup db imports (use heat code, don't import nova modules)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/db/sqlalchemy/api.py    |    1 -
 heat/db/sqlalchemy/models.py |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit 4b6482c6a3c8530ff2a98de87742ce438fee1c76
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 16:25:07 2012 +1000

    Consistently create the db resource entry.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |   37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

commit 0ee8db445941f24e07a3a93b91adc87c192b1c1f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 15:26:09 2012 +1000

    Add SecurityGroups to make is easier to use EIP
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py                              |    2 +
 heat/engine/resources.py                           |   48 ++++++++++++++++++++
 .../WordPress_Single_Instance_With_EIP.template    |   12 +++++
 3 files changed, 62 insertions(+)

commit 4d7e2721ea74c69ef02ff16e86dc6a3ee1265eb9
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 12:10:10 2012 +0200

    Eliminate overly-broad exception catching
    
    We probably don't want to catch e.g. KeyboardInterrupt in these cases.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/engine/manager.py   |    4 ++--
 heat/engine/parser.py    |    6 +++---
 heat/engine/resources.py |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 16986b4062802eb5f01641677326b51ead575215
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 12:10:10 2012 +0200

    Improvements to DB setup
    
    Don't fail if the database or user already exists.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-db-setup-fedora |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

commit a03a307d33ef5fedab6ec08532a1ed4b82c25b5a
Author: Zane Bitter <zbitter@redhat.com>
Date:   Fri Apr 13 12:10:10 2012 +0200

    Issue #52: Fix error in db-setup script
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 bin/heat-db-setup-fedora |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 31ae00df42c492b7fac79f67445bb40c022a3d6c
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 21:16:42 2012 -0700

    Start systemd services properly with cfn-init tool
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/cfntools/cfn-init |    1 +
 1 file changed, 1 insertion(+)

commit 2a9a87dc3e22bf1d045add1351cb1bad332a1b5e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 12:37:13 2012 +1000

    Fix the jeos path when running from installed code.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit c453a33f35335eae74161f3bf4a6b536496b4894
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 10:16:29 2012 +1000

    Delete extra white space
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py  |    2 +-
 heat/client.py         |    2 +-
 heat/engine/manager.py |   16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

commit 5bb18073cbf069b5812c64b1f5c7d4e93ef49ddf
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Apr 13 10:13:42 2012 +1000

    Fix 'heat list' when there are no stacks
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py  |    5 +++--
 heat/engine/manager.py |    2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

commit ec794e6d4a3777a89a0136bd397abfffb3dfd485
Merge: 2f5ec87 aba5fc8
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Apr 12 18:32:48 2012 -0400

    Merge branch 'master' of github.com:heat-api/heat

commit 2f5ec8738dc557db6c51416b3cfb1a45b9eeedb4
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Thu Apr 12 17:42:52 2012 -0400

    Make jeos_create aware of existing disk files and previous glance registrations
    
    The user is interactively prompted for decisions to be made when:
    -An existing jeos disk image is found: build a fresh JEOS?
    -If fresh JEOS is chosen, continue as normal removing the files and
     existing registration if it exists.
    -If no fresh JEOS is chosen: register existing JEOS with glance?
    -If no registration is chosen, no action is taken.
    -If registration is chosen, continues as normal without rerunning oz in the
     case of the image not being previously registered with glance.
    -If the image is previously registered: delete existing JEOS in glance?
    -If the user chooses to not delete existing registration, no action is taken.
    -If registration deletion is chosen, the registration is deleted, rerunning
     oz is skipped, and the registration will occur.
    
    Fixes #50
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 bin/heat |   74 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 23 deletions(-)

commit aba5fc8a444f130e61f1642440f69b87a26c7c60
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 14:16:41 2012 -0700

    Update F17 cfntools image to properly boot for cloudinit
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F17-i386-cfntools-jeos.tdl |   37 +---------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

commit f9c645a09f90a2d44a1e6ba48b0f342d129bdf81
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 14:05:59 2012 -0700

    Add ec2-user to F17 x86_64 tdl
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F17-x86_64-cfntools-jeos.tdl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 85a9df46d2b56497b7d75f5451400cfc2f76245c
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 14:05:13 2012 -0700

    add ec2-user to F16 cfntools image
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-i386-cfntools-jeos.tdl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7abe849db7d7b6e1ea6ff337df63cc20c7cfadef
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 14:01:45 2012 -0700

    Update i386 F16 cfntools image to match latest cloudinit features
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-i386-cfntools-jeos.tdl |   37 +---------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

commit 98649be02d0448b9143149946192486231ba489f
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 14:00:24 2012 -0700

    updated F17 x86_64 cfntools tdl to new cloudinit model
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F17-x86_64-cfntools-jeos.tdl |   38 +-------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

commit 797ea880d982e0f25b5c18f3689da0a994658c05
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 13:33:27 2012 -0700

    Install cloudinit specific files that are loaded into the mime userdata
    
    Partially fixes Issue #48
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 MANIFEST.in                    |    2 ++
 heat/cloudinit/config          |    9 +++++++++
 heat/cloudinit/part-handler.py |   14 ++++++++++++++
 3 files changed, 25 insertions(+)

commit af451c207424f1ee2ccbce2eafbdeaa953ad50f9
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 12 13:17:46 2012 -0700

    Updated x86_64 cfntools tdl to work with broken F16 repos and cloud-init
    
    Partially fixes Issue #48
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-x86_64-cfntools-jeos.tdl |   37 +-------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

commit 1a3186dc6f8a83e92112ac53a2672c31286bfaac
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 12 14:00:53 2012 -0400

    fixing small sed typo

 .../WordPress_2_Instances_With_EBS_Volume.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b633c768c4af7adb88c63d0f4f21d6564e2f1ec8
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 12 18:18:35 2012 +0200

    Add elastic IP and userdata to 2-instance template
    
    Ref: #56
    
    The 2-instance Wordpress template with EBS now uses Elastic IPs for both
    servers. The IPs are referenced from the init scripts in UserData.
    
    The template wasn't tested yet.

 .../WordPress_2_Instances_With_EBS_Volume.template |  101 +++++++++++++++++++-
 1 file changed, 97 insertions(+), 4 deletions(-)

commit c226a24efca9975365aeb36dcfbf052398accd78
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 12 11:05:11 2012 -0400

    Fixing the heat events_list <stack name>
    
    Patch provided by Zane Bitter, thx.

 heat/engine/manager.py |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

commit ead1838fb771c14eed22eef31f849d2799461717
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 12 16:57:48 2012 +0200

    Move the EIP settings into a different template
    
    We'll keep the WordPress_Single_Instance.template simple.

 templates/WordPress_Single_Instance.template       |   15 --
 .../WordPress_Single_Instance_With_EIP.template    |  163 ++++++++++++++++++++
 2 files changed, 163 insertions(+), 15 deletions(-)

commit d41059f6a9c2afbbcbdfe19737dd40d49974d269
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 12 20:28:14 2012 +1000

    Initial ElasticIp work - not quite working
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py                     |   64 +++++++++++++++++++-------
 templates/WordPress_Single_Instance.template |   15 ++++++
 2 files changed, 62 insertions(+), 17 deletions(-)

commit 9358f20d40ac3e50c4de4747137b1faae699a14a
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Apr 11 22:22:43 2012 -0400

    Add newly added tdls to manifest.
    
    Related to issue #26

 MANIFEST.in |    4 ++++
 1 file changed, 4 insertions(+)

commit 01488938cf3be19b0d1a357543299e48f87a5a58
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Wed Apr 11 20:56:45 2012 -0400

    Add 32-bit tdls for Fedora 16,17 jeos (gold and cfntools)
    
    fixes #26
    
    Note that the templates have been adjusted and the naming of the 32-bit
    versions to i386 instead of i686. The install really is i686, but making
    the arch match what is listed in the install ISO seems less confusing.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
    
    Although the 32-bit version of Fedora (and others) ISOs are labeled with i386,

 bin/heat                                           |   36 ++++++------
 heat/engine/resources.py                           |    1 +
 heat/jeos/F16-i386-cfntools-jeos.tdl               |   61 ++++++++++++++++++++
 heat/jeos/F16-i386-gold-jeos.tdl                   |   61 ++++++++++++++++++++
 heat/jeos/F17-i386-cfntools-jeos.tdl               |   61 ++++++++++++++++++++
 heat/jeos/F17-i386-gold-jeos.tdl                   |   61 ++++++++++++++++++++
 templates/WordPress_2_Instances.template           |   12 ++--
 .../WordPress_2_Instances_With_EBS_Volume.template |   12 ++--
 templates/WordPress_Single_Instance.template       |   12 ++--
 ...dPress_Single_Instance_With_EBS_Volume.template |   12 ++--
 .../WordPress_Single_Instance_cfntools.template    |   12 ++--
 11 files changed, 294 insertions(+), 47 deletions(-)

commit adf53e972ab64f2ce8efe60074961c3e0aef39a1
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Apr 11 19:15:38 2012 +0200

    Fix exception getting events list
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/db/sqlalchemy/api.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f2a952c790e472c2264cbff428278d03fbc843bc
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Apr 11 18:59:33 2012 +0200

    Import missing exceptions
    
    The local definitions of several exceptions were removed by commit
    e7f05dba5d899200b9e09b22ea423fa33fd1b612 because OpenStack already provides
    them, but we need to import them to actually be able to use them.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/exception.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 34962ac0749468c4caa31c99ade76f15fb641cda
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Apr 11 17:17:04 2012 +0200

    Fix setting of admin role in keystone service
    
    The script was looking for the "admin" user instead of the "admin" *role*.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 tools/heat-keystone-service |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 11854762757255dc7d10063704f3425898c973d1
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 11 09:48:42 2012 -0400

    Resolving functional conflicts from merge

 heat/engine/manager.py   |    7 ++-----
 heat/engine/parser.py    |    3 ---
 heat/engine/resources.py |    2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

commit 0dc8d604abab9550446bfcbd67181c9b28920991
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 11 09:00:14 2012 -0400

    Adding new files to heat.spec file

 heat.spec |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit dc696e5e9c9973f19a226551f261e60e7801350c
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 11 08:24:08 2012 -0400

    Defaulting to the mysql db_backend, removing anydbm

 heat/common/config.py    |    2 +-
 heat/db/anydbm/api.py    |   99 ----------------------------------------------
 heat/engine/manager.py   |    1 +
 heat/engine/resources.py |    1 +
 4 files changed, 3 insertions(+), 100 deletions(-)

commit 1c96afa5023bcb83821057e44506bac7248b4b19
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Apr 11 07:15:13 2012 -0400

    Making delete stack work

 heat/db/sqlalchemy/api.py |   14 +++++++++++---
 heat/engine/manager.py    |    2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

commit f2f4aff1870fcf1647ca176db3b83be94cf1427f
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 10 16:58:45 2012 -0400

    Persisting resources

 heat/client.py                                     |    2 --
 heat/db/api.py                                     |    5 +++++
 heat/db/sqlalchemy/api.py                          |   20 ++++++++++++++++++--
 .../migrate_repo/versions/001_norwhal.py           |   15 ++++++++++++---
 heat/db/sqlalchemy/models.py                       |   13 ++++++++++---
 heat/engine/manager.py                             |   15 +++++++++------
 heat/engine/parser.py                              |   11 +++++++++--
 heat/engine/resources.py                           |   13 ++++++++++++-
 8 files changed, 75 insertions(+), 19 deletions(-)

commit c8868921facf42de1d73a844c4118039c3576ac9
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Apr 10 07:57:09 2012 -0400

    Made datetime objects JSON compatible by calling their to string functions

 heat/client.py         |    4 ++--
 heat/engine/manager.py |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 77a004167ac34b7d9073d7606392a15b188733b3
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Apr 5 11:05:11 2012 -0400

    Integrating all stack, template, and event calls with database

 bin/heat                                           |    1 -
 bin/heat-db-setup-fedora                           |    9 +-
 heat/api/v1/stacks.py                              |   13 +--
 heat/client.py                                     |    2 -
 heat/common/wsgi.py                                |    2 -
 heat/db/anydbm/api.py                              |    1 -
 heat/db/api.py                                     |    5 +-
 heat/db/sqlalchemy/api.py                          |   41 +++------
 .../migrate_repo/versions/001_norwhal.py           |   10 ++-
 heat/db/sqlalchemy/models.py                       |   38 +++++++--
 heat/engine/manager.py                             |   88 +++++++++++---------
 heat/engine/resources.py                           |   17 +---
 12 files changed, 115 insertions(+), 112 deletions(-)

commit 95e10314952f1894b12fca1090759d4458ff785c
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Apr 11 14:03:37 2012 +0200

    Fix reporting of RemoteError exceptions from AMQP
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/rpc/amqp.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f45f677a5f11d33990c7edef653a283317a55f38
Author: Zane Bitter <zbitter@redhat.com>
Date:   Wed Apr 11 14:03:37 2012 +0200

    Handle missing config file
    
    Report a more useful error when no config file can be found.
    
    Signed-off-by: Zane Bitter <zbitter@redhat.com>

 heat/common/config.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 7523932c5d7ef794a26fab0de13b7bc242577cc0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 11 19:29:13 2012 +1000

    Fix silly spello
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 4539bdeca6e481ae74a2d019af7344850f5e813f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 11 19:28:31 2012 +1000

    Record the reason for any failures
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/common/exception.py |   11 +++++++++++
 heat/engine/parser.py    |   10 ++++++----
 heat/engine/resources.py |   22 ++++++++++++++++------
 3 files changed, 33 insertions(+), 10 deletions(-)

commit 9bad23299184fc19ec3e4aee8241bae667c639ee
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Apr 11 00:33:40 2012 -0700

    Make better use of cloud-init
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-x86_64-cfntools-jeos.tdl |    8 +-------
 heat/jeos/F17-x86_64-cfntools-jeos.tdl |    7 +------
 2 files changed, 2 insertions(+), 13 deletions(-)

commit df1ad15c8a4af9702f16fe7553822d585ee9a2c4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 11 14:52:12 2012 +1000

    Make the create/delete non-blocking
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/manager.py   |    4 ++--
 heat/engine/parser.py    |   40 +++++++++++++++++++++++++++++---------
 heat/engine/resources.py |   48 +++++++++++++++++++++++-----------------------
 3 files changed, 57 insertions(+), 35 deletions(-)

commit 2c492583e111260e37c8999c618f7f7b4f87ac40
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Apr 11 12:55:57 2012 +1000

    Fix path to keystonerc
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 tools/openstack |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4b360e33c274b99150be123446b84e566ad00e7f
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 10 18:01:59 2012 -0700

    Rename cftools to cfntools in the wordpress single instance template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 .../WordPress_Single_Instance_cfntools.template    |  148 ++++++++++++++++++++
 .../WordPress_Single_Instance_cftools.template     |  148 --------------------
 2 files changed, 148 insertions(+), 148 deletions(-)

commit c8f6c1752c6cd2f7452d6f454c91f31564b70ecf
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 10 13:53:53 2012 -0700

    Put cfn-tools into the cfntool image
    
    Closes issue #59
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 34f55bdbd6bfd43208563c9a2dac993021f397c0
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 10 12:26:44 2012 -0700

    Renamed all occurrances of cftools to cfntools to be more consistent
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 MANIFEST.in                            |    4 +-
 bin/heat                               |   10 ++---
 heat/jeos/F16-x86_64-cfntools-jeos.tdl |   67 +++++++++++++++++++++++++++++++
 heat/jeos/F16-x86_64-cftools-jeos.tdl  |   67 -------------------------------
 heat/jeos/F17-x86_64-cfntools-jeos.tdl |   68 ++++++++++++++++++++++++++++++++
 heat/jeos/F17-x86_64-cftools-jeos.tdl  |   68 --------------------------------
 6 files changed, 142 insertions(+), 142 deletions(-)

commit 39f953802fb91a75f379d9af0764d99334fcf99c
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 10 11:59:38 2012 -0700

    Move cfntools to heat directory so they are accessible by jeos_create
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 MANIFEST.in              |    3 +
 cftools/README           |   13 -
 cftools/cfn-hup          |   16 --
 cftools/cfn-init         |  596 ----------------------------------------------
 cftools/cfn-signal       |   16 --
 heat/cfntools/README     |   13 +
 heat/cfntools/cfn-hup    |   16 ++
 heat/cfntools/cfn-init   |  596 ++++++++++++++++++++++++++++++++++++++++++++++
 heat/cfntools/cfn-signal |   16 ++
 9 files changed, 644 insertions(+), 641 deletions(-)

commit 434438d2e197864dc2a3804b4790744d20d5374d
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Apr 10 17:18:28 2012 +0200

    Add 2-instance Wordpress template without EBS
    
    Ref #56
    
    The template has two instances. The Wordpress one depends on DatabaseServer.
    Therefore, WP should be started after DB and it should use DB's private IP in
    the Wordpress setup.

 templates/WordPress_2_Instances.template |  179 ++++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)

commit 20c2b8891a1d129d9bb5ef254bb4a96b1a6fabf7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 10 14:13:06 2012 +1000

    Try harder to detach the server volume.
    
    It seems to need some encouragement.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit da38f9af185983b9f9dad9d320b27e99c6f090d3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 10 14:12:05 2012 +1000

    Don't use the "depends_on" in resource.start
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    2 --
 1 file changed, 2 deletions(-)

commit b3893cde96effc0280f564fcc84561174aa242c4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 10 14:10:53 2012 +1000

    Cleanup some prints in the resources
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

commit 555bb45cd5f51f34c363ecdb1332c680b607238a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 10 09:41:23 2012 +1000

    Add a 2 instance wordpress example
    
    Ref #56
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .../WordPress_2_Instances_With_EBS_Volume.template |  159 ++++++++++++++++++++
 1 file changed, 159 insertions(+)

commit a9fd72c21c23d8709e737af817050896538828d7
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 10 08:57:55 2012 +1000

    Improve the ordering of stopping resources
    
    Create a common function to generate the start order
    and stop in the reverse order.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py |   53 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 14 deletions(-)

commit c51273efaaf74f59cef72d01ac9a39f36046ae3b
Author: Greg Blomquist <gblomqui@redhat.com>
Date:   Tue Apr 3 19:45:20 2012 -0400

    Issue #54: Getting started with cfn-init
    
    Implemented features:
      * sysv and systemd service handling
      * yum package management
    
    Running the script:
      e.g., sudo python cfn-init -f resource-metadata.json
    
    Example resource metadata file contents:
    {
        "AWS::CloudFormation::Init": {
            "config": {
                "packages": {
                    "yum": {
                        "rubygem-fattr" : []
                    }
                },
                "services": {
                    "sysvinit": {
                        "httpd": {
                            "enabled" : "true",
                            "ensureRunning" : "true"
                        }
                    }
                }
            }
        }
    }

 cftools/cfn-init |  580 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 580 insertions(+)

commit 56e8d806303a8d2437940a432750b8a649e79ae0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 9 22:23:42 2012 +1000

    Get the volumes working properly.
    
    Tested with:
    heat create wp_ebs -t ./templates/WordPress_Single_Instance_With_EBS_Volume.template --parameters="InstanceType=m1.xlarge;KeyName=my_key"
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py    |    5 +++
 heat/engine/resources.py |   94 ++++++++++++++++++++++++++++++++++------------
 tools/openstack          |    6 +--
 3 files changed, 77 insertions(+), 28 deletions(-)

commit 22c2dde2ac808c997150941440156b52fc8d328b
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Apr 5 11:42:36 2012 -0700

    Add documentation for heat jeos_create function
    
    Partially Fixes issue #58
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit 8483e2219fac031148e7e9f7415043de783bfc5a
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Apr 5 11:41:12 2012 +0200

    typo fix in jeos_create

 bin/heat |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c0fd06bc1f5c824af3eda3507611133b5fdd2542
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 16:40:19 2012 +1000

    Fix "heat list" only showing empty list.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e7f05dba5d899200b9e09b22ea423fa33fd1b612
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 16:39:22 2012 +1000

    Add utils & exception from openstack-common
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat-api                       |    3 +
 bin/heat-engine                    |   14 ++-
 heat/common/config.py              |  158 +++++++++++++++++++-----
 heat/common/context.py             |    2 +-
 heat/common/exception.py           |  179 ++++-----------------------
 heat/common/utils.py               |   96 +--------------
 heat/common/wsgi.py                |    2 +-
 heat/context.py                    |    9 +-
 heat/db/api.py                     |    6 +-
 heat/engine/resources.py           |    3 -
 heat/openstack/common/exception.py |  147 +++++++++++++++++++++++
 heat/openstack/common/utils.py     |  233 ++++++++++++++++++++++++++++++++++++
 heat/rpc/__init__.py               |   20 ++--
 heat/rpc/amqp.py                   |    7 +-
 heat/rpc/common.py                 |   20 +---
 heat/rpc/impl_qpid.py              |   95 ++++-----------
 heat/service.py                    |   50 +-------
 openstack-common.conf              |    2 +-
 18 files changed, 596 insertions(+), 450 deletions(-)

commit aff20aca99866b0b1244133313b65d0be395034d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 10:42:52 2012 +1000

    Use local.py from openstack-common
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/context.py                    |    2 +-
 heat/local.py                      |   37 --------
 heat/openstack/common/cfg.py       |  164 ++++++++++++++++++++++++++++--------
 heat/openstack/common/iniparser.py |  126 +++++++++++++++++++++++++++
 heat/openstack/common/local.py     |   37 ++++++++
 heat/rpc/amqp.py                   |   10 +--
 openstack-common.conf              |    2 +-
 7 files changed, 301 insertions(+), 77 deletions(-)

commit f4d4f60f8fed29e8148ac9af4efd93cc82c3c313
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Apr 4 18:50:03 2012 -0700

    Add F17 cftools TDL
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 MANIFEST.in                           |    1 +
 heat/jeos/F17-x86_64-cftools-jeos.tdl |   68 +++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

commit d6cce8198d3f1fd3ce97851439868c0d39a183ba
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Apr 4 17:39:24 2012 -0700

    Add F16 cftools tdl
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-x86_64-cftools-jeos.tdl |   67 +++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

commit bd598a8399a3bfb39dbd6ec5ba7f0a676d3ad060
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 10:19:32 2012 +1000

    Fix events_list
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d9ab5bdad44a231fa10b8a34ca31d43cea4fbd66
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 10:12:44 2012 +1000

    Fix describe and delete
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py  |   16 ++++++++++------
 heat/engine/manager.py |    4 ----
 2 files changed, 10 insertions(+), 10 deletions(-)

commit 8a6eb03d62dab0133ba59fd50654badfb9063e8b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 09:59:16 2012 +1000

    Pass the parameters to the parser
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat-engine        |    2 +-
 heat/api/v1/stacks.py  |    3 ++-
 heat/engine/manager.py |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

commit ebcb364e7990086933aba5adec0f3e41c24c5c86
Merge: 7690e1b e4a27e8
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Apr 5 09:11:59 2012 +1000

    Merge rpc branch
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit e4a27e88f2c33fdae51b02c849306567df9de66c
Author: Ian Main <imain@redhat.com>
Date:   Wed Apr 4 14:29:54 2012 -0700

    Remove some more unused files.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/api/v1/stacks.py |    2 -
 heat/engine/client.py |  173 -------------------------------------------------
 2 files changed, 175 deletions(-)

commit 3eb40cae130015dcc85de56fdc5c9e30496eecf3
Author: Ian Main <imain@redhat.com>
Date:   Wed Apr 4 14:18:44 2012 -0700

    Don't need these files anymore.  As per the layout in nova compute
    the manager is handling all the engine api calls.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/api/__init__.py    |   15 ------
 heat/engine/api/v1/__init__.py |   38 -------------
 heat/engine/api/v1/events.py   |   52 ------------------
 heat/engine/api/v1/stacks.py   |  115 ----------------------------------------
 4 files changed, 220 deletions(-)

commit 7690e1b5d4ca5dce2aeccbb04da43871cd8718fc
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Apr 4 19:13:37 2012 +0200

    Fix --template-file
    
    Fixes #47
    
    The code that causes the URI TOO LONG error is in eventlet.wsgi.
    
    So for the time being we're replacing that with paste.httpserver which serves
    WSGI apps, too.
    
    Longer term, we want to use eventlet but they need to make the maximum URL
    length configurable.

 bin/heat-api    |    5 ++---
 bin/heat-engine |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

commit ec9c7009fa184e609cbc0d5c4ae937ce5220afc2
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Apr 4 09:17:25 2012 -0700

    Use some evil to get the jeos tdl path
    
    Resolves issue #46
    heat:251 tdl_path uses get_python_lib() which doesn't work with eggs
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 485b0dcb291adc9420475dd988de85c355d71e3a
Author: Ian Main <imain@redhat.com>
Date:   Tue Apr 3 16:57:23 2012 -0700

    Fix stack_delete()
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c94960563adae02138238db94ef8ee53a53cbb90
Author: Ian Main <imain@redhat.com>
Date:   Tue Apr 3 16:55:20 2012 -0700

    stack_db attributes seem broken.  Comment these out for now and the API
    is generally working.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/manager.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 1163ec9ce744b45a609274ea6c0e30d2110b346e
Author: Ian Main <imain@redhat.com>
Date:   Tue Apr 3 16:40:11 2012 -0700

    Fix create a bit more.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 06d5b8c378e9ffd496b1bb49db16f8fc85516825
Author: Ian Main <imain@redhat.com>
Date:   Tue Apr 3 16:31:53 2012 -0700

    Hook up RPC methods
    
    This commit hooks up all the calls via RPC to the new implementations
    in manager.py.  I haven't tested them all yet.. I'm getting HD failure
    warnings and want to get this commited before something goes terribly
    wrong :).
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/api/v1/stacks.py  |   42 ++++++++++++----------------
 heat/engine/manager.py |   72 ++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 84 insertions(+), 30 deletions(-)

commit ebdf76e1e8538823ed93247eed03042907b93815
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 3 15:53:27 2012 -0700

    Pre-bake cftools into an image
    
    After this change, new JEOS will need to be created since the JEOS
    names have changed.
    
    For a cfntool image:
    heat jeos_create F16 x86_64 cftools
    
    For a gold image:
    heat jeos_create F16 x86_64 gold
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 MANIFEST.in                                        |    1 +
 bin/heat                                           |   28 ++--
 heat.spec                                          |    1 +
 templates/WordPress_Single_Instance.template       |   12 +-
 ...dPress_Single_Instance_With_EBS_Volume.template |   12 +-
 .../WordPress_Single_Instance_cftools.template     |  148 ++++++++++++++++++++
 6 files changed, 181 insertions(+), 21 deletions(-)

commit 2915c99d466e28a7b1d2e1fafbd0cf65817b7560
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 3 11:51:16 2012 -0700

    Initial CloudFormations dummy files for vm helper tools
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 cftools/README     |   13 +++++++++++++
 cftools/cfn-hup    |   16 ++++++++++++++++
 cftools/cfn-init   |   16 ++++++++++++++++
 cftools/cfn-signal |   16 ++++++++++++++++
 4 files changed, 61 insertions(+)

commit 12b75ffa7f12f2f7d6ed67e8e39fb00b7c576360
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Apr 3 08:21:30 2012 -0700

    Revert "Allow templates specified from local filesystem"
    
    Unfortunately this patch isn't quite correct.  It passes data in the body
    of the message, but the API specifies passing in the url parameters.  This
    results in user parameters not being passed to the instance properly.
    
    This reverts commit 4679fb01c641053d45a197b598e28552144391a9.

 heat/api/v1/__init__.py |    2 +-
 heat/api/v1/stacks.py   |   22 +++++++++++-----------
 heat/client.py          |   20 ++++++++------------
 heat/common/client.py   |    5 -----
 heat/engine/client.py   |   21 +++++++++++++++++----
 5 files changed, 37 insertions(+), 33 deletions(-)

commit 07e99ea570dbc20999f267aea4d7e220bbb60ca0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 3 16:27:27 2012 +1000

    Do mimimum to work with anydb.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/db/anydbm/api.py |   33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

commit 20cdc46a948a85bd9b49d4b35b007a1794276afb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 3 15:39:29 2012 +1000

    Add support for the Output section.
    
    Implements issue #51
    
    To see the outputs run "heat describe <stack name>"
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/api/v1/stacks.py |   12 ++++++------
 heat/engine/parser.py        |   27 +++++++++++++++++++++++++++
 heat/engine/resources.py     |   18 ++++++++++++++----
 3 files changed, 47 insertions(+), 10 deletions(-)

commit 59b89dfbe20fab67ef5398a62804ae95c2162640
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 3 14:13:09 2012 +1000

    Add an Outputs section to the template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/WordPress_Single_Instance.template |    7 +++++++
 1 file changed, 7 insertions(+)

commit c7d3e2179c61da096f878c3452d277f87ef251d0
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Apr 3 14:11:35 2012 +1000

    run dos2unix on the templates
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/WordPress_Single_Instance.template       |  280 ++++++++++----------
 ...dPress_Single_Instance_With_EBS_Volume.template |    2 +-
 2 files changed, 141 insertions(+), 141 deletions(-)

commit 447e73a82f5ada79c933f77f576c954d6d60d5d5
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 2 16:17:06 2012 -0400

    Updating the README to point to the Getting Started Wiki

 README.rst |   32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

commit 04d73a59ba00f0c73e04271a2c13f31f8f23cc51
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Mon Apr 2 08:12:33 2012 -0400

    Adding the sqlalchemy db implmentation

 etc/heat-engine.conf                               |    2 +
 heat/common/config.py                              |    7 ++
 heat/db/api.py                                     |   27 +++--
 heat/db/sqlalchemy/api.py                          |  123 ++++++++++++++++----
 .../migrate_repo/versions/001_norwhal.py           |   18 ++-
 heat/db/sqlalchemy/models.py                       |   23 ++--
 heat/db/sqlalchemy/session.py                      |   97 +++++++++++++++
 heat/engine/api/v1/stacks.py                       |   22 ++--
 heat/engine/parser.py                              |    2 +-
 heat/engine/resources.py                           |   21 ++--
 tools/README                                       |    3 +
 11 files changed, 283 insertions(+), 62 deletions(-)

commit 4679fb01c641053d45a197b598e28552144391a9
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Apr 2 18:00:00 2012 +0200

    Allow templates specified from local filesystem
    
    Fixes #47
    
    Passing a template file (as opposed to a URL) to the CLI:
    
          ./heat -d create wordpress \
            --template-file=../templates/WordPress_Single_Instance.template
    
    caused a 'URI too long' error. The reason was that we were passing the entire
    template contents to the Heat API server inside the URL params.
    
    This makes sure that templates are passed around inside HTTP body rather than
    the URL.

 heat/api/v1/__init__.py |    2 +-
 heat/api/v1/stacks.py   |   22 +++++++++++-----------
 heat/client.py          |   20 ++++++++++++--------
 heat/common/client.py   |    5 +++++
 heat/engine/client.py   |   21 ++++-----------------
 5 files changed, 33 insertions(+), 37 deletions(-)

commit daa4fc256b16d90d437df1590e8f64fe8f88967f
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Apr 2 07:03:40 2012 -0700

    Updated openstack script to print a note about the default network
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit e354226876fd64a28672841efedf6d86880f249f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 23:04:35 2012 +1000

    Beginings of Volumes and VolumeAttachments
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py                           |   83 ++++++++-----
 templates/WordPress_Single_Instance.template       |    4 +-
 ...dPress_Single_Instance_With_EBS_Volume.template |  125 ++++++++++++++++++++
 3 files changed, 179 insertions(+), 33 deletions(-)

commit be476524a13c735892bd76bc46dc4315c023b7f4
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Apr 2 14:46:59 2012 +0200

    Update readme with the Keystone service setup

 README.rst |    5 +++++
 1 file changed, 5 insertions(+)

commit 4018da01860671973b41bf4511f96d41f3fc4412
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Thu Mar 29 15:14:21 2012 -0400

    Add a heat database to store templates, state, and events
    Fixes #39

 MANIFEST.in                                        |    1 +
 bin/heat-db-setup-fedora                           |  239 ++++++++++++++++++++
 etc/heat-engine.conf                               |    2 +
 heat.spec                                          |    4 +-
 heat/db/sqlalchemy/api.py                          |   35 +++
 heat/db/sqlalchemy/manage.py                       |    5 +
 heat/db/sqlalchemy/migrate_repo/README             |    4 +
 heat/db/sqlalchemy/migrate_repo/manage.py          |    5 +
 heat/db/sqlalchemy/migrate_repo/migrate.cfg        |   25 ++
 .../migrate_repo/versions/001_norwhal.py           |   66 ++++++
 heat/db/sqlalchemy/models.py                       |  117 ++++++++++
 setup.py                                           |    3 +-
 12 files changed, 504 insertions(+), 2 deletions(-)

commit 1f861a50cdad5096886fe89102e5323072513b00
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 15:48:00 2012 +1000

    Make the "heat delete" command work.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/api/v1/stacks.py |    1 +
 heat/engine/parser.py        |    4 ++++
 heat/engine/resources.py     |   23 +++++++++++++++++++++++
 3 files changed, 28 insertions(+)

commit 986e39c3b6e600f449412e6c8f2dce0ea92f75bc
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 15:15:10 2012 +1000

    Fix a crash in "heat show/list"
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/api/v1/stacks.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 7daa8884bdd2a8bdc550d39c6b86ea3eec407b1c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 13:54:47 2012 +1000

    Fix keystone creds in parser
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit db5b63733e81e934b5cb2be1455bef7948015b4e
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 19:15:21 2012 -0700

    Make wordpress template leave mysql+http running, and start/enable them by default
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_Single_Instance.template |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

commit 8d372fcb16b2da3346446dc16a3b9bd8fcc7f1be
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 12:00:21 2012 +1000

    Pass the keystone creds to resource.py so usable from run-parser and heat
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/run-parser.py        |   12 ++++++++++++
 heat/engine/parser.py    |    1 +
 heat/engine/resources.py |   13 ++++---------
 3 files changed, 17 insertions(+), 9 deletions(-)

commit 7d11d4abf6437dc34ba0d88f501d6b6b693ac219
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Apr 2 11:59:18 2012 +1000

    temporarily hack out the keystone auth.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/common/context.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit f4fa8645fba184b71b124a4c1cd68122c7c3ad1f
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 16:59:51 2012 -0700

    Updated wordpress single instance template to have quotes in proper place
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_Single_Instance.template |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 9539f7aad304d260818ab6a85100f9c00afdfa49
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 15:36:57 2012 -0700

    F16 updates broken- Delete F16 and F17 update repos and don't yum update
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-x86_64-gold-jeos.tdl |    2 +-
 heat/jeos/F17-x86_64-gold-jeos.tdl |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit d924d9db067a107b52647d2e4ebe680263b83558
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 13:40:37 2012 -0700

    Start userdata script after decoding
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-x86_64-gold-jeos.tdl |    6 ++++++
 heat/jeos/F17-x86_64-gold-jeos.tdl |    6 ++++++
 2 files changed, 12 insertions(+)

commit 7dee96f56d4225afebdce90eedc0ca3ccd2dcb5c
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 13:35:53 2012 -0700

    use << intead of &lt;&lt; in Wordpress example
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 templates/WordPress_Single_Instance.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b26a54014f2ce918579c52fd734ef5e56a54cd2
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 12:50:25 2012 -0700

    Add FnBase64 encoder, encode user data, and feed to nova userdata
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

commit 0fbfc437ae047fb0b802072ea9ac5a1d0cca88e2
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 10:35:35 2012 -0700

    Add installation of cloud-init to the JEOS creation operation
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-x86_64-gold-jeos.tdl |    4 +---
 heat/jeos/F17-x86_64-gold-jeos.tdl |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

commit 5b400fbe189c664eb729df8bb767568e18f6998e
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Apr 1 10:33:28 2012 -0700

    Show how to create a network after using the openstack tools script
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/README |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit ade5e43c46f8f26557bada7e5c4a94acd1a4dedc
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 30 14:27:18 2012 -0700

    Remove errant debugging print from run-parser.py
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/run-parser.py |    1 -
 1 file changed, 1 deletion(-)

commit bc7bc4ee01f7f99f0b2f033e1b88bf91276f2624
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 30 14:24:15 2012 -0700

    Update to setup directions
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 README.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 75f80851715e6838888aa5b08a52483cddfe5952
Author: Ian Main <imain@redhat.com>
Date:   Fri Mar 30 14:05:36 2012 -0700

    Stack list now communicating end to end.  Time to hook some stuff up.

 heat/api/v1/stacks.py  |    2 +-
 heat/engine/manager.py |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

commit cfdd2e4545a36f342866664df206d8397b749a93
Author: Ian Main <imain@redhat.com>
Date:   Fri Mar 30 13:38:48 2012 -0700

    Change default exchange to heat-engine from nova.  Hook up 'list' though
    it doesn't work yet.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/api/v1/stacks.py |   11 +++--------
 heat/common/config.py |    2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

commit 9b0af6de59350e94d41028c303a8916cca38f436
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 30 10:46:29 2012 -0700

    Make create Working with recent glance mysql changes in F16/F17 RPMs
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit a1e9714473c8ee31e47e782d9745fe9e71e5f09b
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 30 08:51:42 2012 -0700

    Add mysql db creation for glance
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

commit 1cc0f413ecbf61b8d073ee625fbc8f3a3f67d01b
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Fri Mar 30 15:20:37 2012 +0200

    Fix run_parser.py to work with the db updates

 bin/run-parser.py        |    3 +++
 heat/engine/resources.py |    3 +++
 2 files changed, 6 insertions(+)

commit ba17e5286b78ce6e0189b96352327ce1dab934a9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 21:28:37 2012 +1100

    Move simpledb to db/anydbm just so we are using the new API.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat-engine              |    2 +-
 heat/common/config.py        |   12 ++++--
 heat/common/utils.py         |   49 ++++++++++++++++++++++++
 heat/db/anydbm/api.py        |   85 ++++++++++++++++++++++++++++++++++++++++++
 heat/db/api.py               |   18 +++------
 heat/engine/api/v1/events.py |    4 +-
 heat/engine/api/v1/stacks.py |    2 +
 heat/engine/resources.py     |    4 +-
 heat/engine/simpledb.py      |   50 -------------------------
 9 files changed, 154 insertions(+), 72 deletions(-)

commit 93726e056706196530ac78c015348f1be68f477c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 15:36:26 2012 +1100

    Fix the service toke and endpoint
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 tools/heat-keystone-service |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit 682f1041c502051b8558e95cd4b115ea9480f18d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 13:51:24 2012 +1100

    Add script to add heat service catalog into keystone
    
    Note the user add is not working for me. But could
    be because I have partly done this a couple of times.
    
    This is based off of:
    https://github.com/openstack/keystone/blob/master/tools/sample_data.sh
    
    Related to issue #31
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 tools/heat-keystone-service |   40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

commit ac1ab674c8ee2481fea447cbfbc02d4e1d2d7967
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 13:02:28 2012 +1100

    Get simple rpc.call working
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py  |    6 +++++-
 heat/common/utils.py   |   28 ++++++++++++++++++++++++++++
 heat/engine/manager.py |    4 ++--
 3 files changed, 35 insertions(+), 3 deletions(-)

commit 8962ca3f84b0444d423fc13ffdc13dd94b435e22
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 12:42:01 2012 +1100

    Add needed strtime functions from nova
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/common/utils.py |    8 ++++++++
 1 file changed, 8 insertions(+)

commit 3c0de821ff8f4ee7c5290fbfc1f33d68f3eb419c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 30 12:26:12 2012 +1100

    Add missing references
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/common/config.py |   34 ++++++++++++++++++++++++++
 heat/common/utils.py  |   65 +++++++++++++++++++++++++++++++++++++++++++++++++
 heat/rpc/common.py    |    2 +-
 3 files changed, 100 insertions(+), 1 deletion(-)

commit 12897989c0ac7bb8850f19f5e0b29c84e33296fd
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Mar 29 16:25:11 2012 -0700

    Wait for server to enter the ACTIVE state or ERROR state and send events
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit fcaea6527b9550c9e7aae5d055150422830e67b4
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Thu Mar 29 18:02:16 2012 +0200

    Stub out the database access API

 heat/db/__init__.py       |   18 ++++++++++
 heat/db/api.py            |   84 +++++++++++++++++++++++++++++++++++++++++++++
 heat/db/sqlalchemy/api.py |   60 ++++++++++++++++++++++++++++++++
 3 files changed, 162 insertions(+)

commit bf651f4207e81ef47e4495402a82e230f533de43
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 29 22:22:33 2012 +1100

    s/image/heat in auth code.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/common/auth.py    |    6 +++---
 heat/common/context.py |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

commit d94b53c31289f9bf322a7f3549763580d68dd63a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 29 22:20:59 2012 +1100

    Copy some glance/common fixes
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/common/auth.py      |    9 ++++++++-
 heat/common/context.py   |   18 ++++++++----------
 heat/common/exception.py |   20 +++++++++++++++++---
 3 files changed, 33 insertions(+), 14 deletions(-)

commit 2b0465c30d9b3252e772adf50ad3a4dedc849be9
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 21:55:36 2012 -0700

    run_parser.py creates an instance now
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |   60 +++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 24 deletions(-)

commit 1ccc461f594da12ad51f5e105060f88c3c85fb33
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 21:30:14 2012 -0700

    Updated run-parser.py to work well with WordPress template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/run-parser.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f1ddc407d3cf4b2898d38fcb1fae922aedfa022d
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 21:29:30 2012 -0700

    Updated README with more precise setup directions
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 README.rst |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 61b54e7b7c2bce91ae66b1267ed780ce4d62dbbc
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 14:57:48 2012 -0700

    Produce proper distro-arch variable for use with launching
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 4c93dcf75a9dfeba643898fbbf014aed30d5bd2c
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 13:51:35 2012 -0700

    Update run-parser to work with proper user parameters as sent through the apis
    
    Fixes Issue #42
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/run-parser.py |   36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

commit 1e7c0eff6ca7f83e29d237da2f7ad207301f41c9
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 28 16:23:15 2012 -0400

    Security credentials are now passed into heat engine from cli
    
    The request parameter KeyStoneCreds has the values for username,
    password, tenant, and authurl
    
    Fixes #30

 README.rst              |    3 ++-
 bin/heat                |    5 ++---
 heat/api/v1/stacks.py   |    4 ++--
 heat/client.py          |    3 ++-
 heat/cloudformations.py |    2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

commit 5b78cd7f6b781768842ec456ea87220698de1f41
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 11:23:25 2012 -0700

    Fix spelling error dependancies->dependencies
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/parser.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 2198a722a47248afa002eae12993a736f01d78c7
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 11:22:30 2012 -0700

    Fix spelling error
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 98bf9b95ddf0ed99bc9d0800c9084671457b214c
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 28 10:52:54 2012 -0700

    Tidy up README.rst
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 README.rst |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 589eaa75e42960a8fc927f9e9f2f777e88e522e8
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 28 12:50:49 2012 -0400

    Removing OpenStack LLC copyright

 bin/heat                |   15 ---------------
 bin/heat-api            |   17 -----------------
 heat/engine/__init__.py |   15 ---------------
 run_tests.py            |   15 ---------------
 4 files changed, 62 deletions(-)

commit 6d9387bb286e1194ceb4c74a4dfc8a61565d3d01
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 28 12:43:54 2012 -0400

    Adding F17 JEOS tdl
    Issue #25

 MANIFEST.in                        |    1 +
 heat.spec                          |   10 +++++--
 heat/jeos/F17-x86_64-gold-jeos.tdl |   57 ++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 3 deletions(-)

commit a4b8e8afb8d3db5cabb52cfd88624e5023d3ae11
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 28 19:36:49 2012 +1100

    Fix some tabbing.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 3bc820fba48fd725a80c6bf0237b205121340ea9
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 28 19:36:18 2012 +1100

    Add the ValidateTemplate API.
    
    Implementing the validate is still a TODO.
    
    Re: issue #1
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat                       |   13 +++++++++-
 heat/api/v1/__init__.py        |    2 ++
 heat/api/v1/stacks.py          |   22 +++++++++++++++++
 heat/client.py                 |    8 ++++++
 heat/engine/api/v1/__init__.py |    3 +++
 heat/engine/api/v1/stacks.py   |   12 +++++++++
 heat/engine/client.py          |   14 +++++++++++
 heat/engine/parser.py          |   53 ++++++++++++++++++++++++++++------------
 8 files changed, 110 insertions(+), 17 deletions(-)

commit 3b49124ee356c9b51f1f2f1615d66e83d47cde1f
Author: Jeff Peeler <jpeeler@redhat.com>
Date:   Tue Mar 27 22:45:42 2012 -0400

    Fix misspelling of Ubuntu so tdl is properly found.
    
    Found while looking at issue #29.
    
    Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

 bin/heat |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5a66af974bef2d44f16102f04e3d1a959a0f58f5
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 28 13:32:20 2012 +1100

    Get the heat --parameters to work.
    
    So now this works:
    heat create pile \
     --template-url=https://raw.github.com/heat-api/heat/master/templates/WordPress_Single_Instance.template \
     --parameters="InstanceType=t1.micro;DBUsername=angus;DBPassword=fruity;LinuxDistribution=F17"
    
    Fixes Issue #40
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py        |    2 +-
 heat/engine/api/v1/stacks.py |    2 +-
 heat/engine/client.py        |    8 ++++++--
 heat/engine/parser.py        |   34 ++++++++++++++++++++++++++--------
 4 files changed, 34 insertions(+), 12 deletions(-)

commit 7dd042134c7d96e735af6172fb2c545d73793ecf
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 27 18:57:25 2012 -0700

    Add ami conversion to OpenStack style architectures
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/resources.py |   31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

commit b7377176be45dffe52499170b305203375de2c0e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 28 11:45:53 2012 +1100

    Account for missing Properties
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/resources.py |    4 ++++
 1 file changed, 4 insertions(+)

commit d35f4ac6482b43859eb40d6b0d539fa60095f6bc
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 28 11:41:19 2012 +1100

    Install /var/lib/heat directory
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 setup.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6153879cff2c2333dde5053456c3a1a4cbca0924
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 27 17:34:30 2012 -0700

    Fix order of parmeters issue
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/run-parser.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 21f1f7abd279e53ad6dc9a6f2065ec3a0bda2f1a
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 27 17:02:27 2012 -0700

    Fix heat jeos_create F16 x86_64 litters files
    
    Fixes Issue #41.
    
    Output the file to /dev/null instead
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b23feadaea69a20ed674470b956413062c0dcfa
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 27 16:26:01 2012 -0700

    Remove unneeded deps
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/jeos/F16-x86_64-gold-jeos.tdl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8b005f95143a6a2ff51f7a6fb6110ed9a0ead487
Author: Ian Main <imain@redhat.com>
Date:   Tue Mar 27 11:56:30 2012 -0700

    Fix up some imports so they work.  I think this is right now. :)
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/engine/manager.py |    2 +-
 heat/service.py        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 903529c05a7767344c5ea56bf77820257b3e5be2
Author: Steven Dake <sdake@redhat.com>
Date:   Tue Mar 27 10:35:47 2012 -0700

    Add README to tools directory to help point out what files do
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/README |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

commit 5c30a02e00a1dcb58ca2aa6caef4ed835fc53deb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 27 11:38:48 2012 +1100

    Initial work on migrating heat-engine to rpc
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat-engine          |   37 +--
 heat/common/config.py    |   26 +-
 heat/common/exception.py |   76 +++++
 heat/common/utils.py     |   12 +
 heat/context.py          |  123 ++++++++
 heat/engine/manager.py   |   65 +++++
 heat/local.py            |   37 +++
 heat/manager.py          |  175 ++++++++++++
 heat/rpc/__init__.py     |  202 +++++++++++++
 heat/rpc/amqp.py         |  384 +++++++++++++++++++++++++
 heat/rpc/common.py       |  144 ++++++++++
 heat/rpc/impl_fake.py    |  188 +++++++++++++
 heat/rpc/impl_kombu.py   |  705 ++++++++++++++++++++++++++++++++++++++++++++++
 heat/rpc/impl_qpid.py    |  552 ++++++++++++++++++++++++++++++++++++
 heat/service.py          |  275 ++++++++++++++++++
 15 files changed, 2979 insertions(+), 22 deletions(-)

commit fbd62cb9c7a6c15fa4a647b5d9802fd7be9b4467
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 26 09:30:18 2012 -0700

    Add error checking and help to tool
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

commit b4b6ac333e92dc9d34fcf85d9353b214a554b94d
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 26 09:20:02 2012 -0700

    Add a missing tab
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d6fb3be1566649718255601923b6ca137aeb855c
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 26 09:18:21 2012 -0700

    Add code that shows how to create an instance
    
    This creates an instance with a keypair, and saves the private key to
    /tmp/private_key.
    
    Then:
    ssh -i /tmp/private_key 10.0.0.x where x is the IP address
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/experimental_create.py |   63 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

commit 072cc84d4996d8219a0f1df99492134d462e0e5c
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Mon Mar 26 15:50:46 2012 +0200

    Consistently use Keystone auth from environment
    
    Fixes #33
    
    All mentions of non-keystone auth environment variables were removed. Acessing
    the proper Keystone ENV was localized into parse_options.
    
    We can now consistently use the `options` object instead of writing
    `options.username or getenv['OS_USERNAME']` all over the place.

 bin/heat       |   33 ++++++++++++++++++++++++++-------
 heat/client.py |   22 ++++++++--------------
 2 files changed, 34 insertions(+), 21 deletions(-)

commit 91ee085a0dd65ae408d29bb494d0208530435203
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 26 16:45:06 2012 +1100

    Begin the change to a python only implementation.
    
    - Don't start pacemaker-cloud cape, instead start the
      resources (soon to be implemented).
    - kill off systemctl, capelistener and json2capexml
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/api/v1/events.py |    4 +-
 heat/engine/api/v1/stacks.py |   19 +--
 heat/engine/capelistener.py  |  103 --------------
 heat/engine/json2capexml.py  |  234 --------------------------------
 heat/engine/parser.py        |  307 +++--------------------------------------
 heat/engine/resources.py     |  308 ++++++++++++++++++++++++++++++++++++++++++
 heat/engine/simpledb.py      |    4 +
 heat/engine/systemctl.py     |   52 -------
 8 files changed, 333 insertions(+), 698 deletions(-)

commit 88b77d2bedda3b08eb55ef163de577e775c6bb26
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 26 15:18:29 2012 +1100

    Add an experimental ssh monitoring script.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 tools/experimental_ssh_eventlet.py |   60 ++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

commit 2846b18251096a22cf0a98f289719f4173f757a4
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 23 14:43:07 2012 -0700

    Covert AWS instance types into Openstack Flavors
    
    Issue #34
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 heat/engine/parser.py |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

commit a2523790919b053d49928fcb3add6fb556bdedf3
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 23 13:17:09 2012 -0700

    Change run_parser.py to run t1.micro rather then m1.large
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/run-parser.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit bce24c6aa63f5b14bdef6bbbd6d28cc0cf0b0b85
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 23 08:37:59 2012 -0700

    Some glance keystone changes from getting started guide
    
    https://fedoraproject.org/w/index.php?title=Getting_started_with_OpenStack_on_Fedora_17&diff=prev&oldid=279696
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

commit 51ecb350c975c63ca4d9a8852df668020368ed27
Author: Steven Dake <sdake@redhat.com>
Date:   Fri Mar 23 08:16:29 2012 -0700

    Updated with latest F17 nova auth fix
    
    https://fedoraproject.org/w/index.php?title=Getting_started_with_OpenStack_on_Fedora_17&diff=next&oldid=279621
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 7d290c20327ae24e618ab4230a50769d62a53e48
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Mar 22 23:54:46 2012 -0700

    install/erase working better
    
    nova command operations not quite right yet
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 tools/openstack |   84 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 46 insertions(+), 38 deletions(-)

commit 6c39ee3521f4bb30884b05775828d15b676efa6c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 23 15:54:46 2012 +1100

    Add a openstack helper install script
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 tools/openstack |  128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)

commit ea6571d29b202bd8c8e83d2fccdf72029fd2a24f
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 23 12:04:54 2012 +1100

    Add elastic ip association to parser.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/engine/parser.py |   60 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

commit 622bb9a702617e4754784a04de66a21c9e2a4e1a
Author: Ian Main <imain@redhat.com>
Date:   Thu Mar 22 17:37:17 2012 -0700

    A few cleanups and some comments.  Nothing major.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 bin/heat        |    7 ++++---
 bin/heat-api    |    4 +++-
 bin/heat-engine |    4 +++-
 heat/client.py  |    4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)

commit 024ccee73475d227040c7927c3f6151614a3092f
Author: Steven Dake <sdake@redhat.com>
Date:   Thu Mar 22 09:08:16 2012 -0700

    Use keystone auth environment variables
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 6dc00394685238d717317e72d1a6e6e7ebfff967
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 22 23:16:48 2012 +1100

    Improved "test" parser for python orchestration.
    
    ./bin/run-parser.py <template>
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/run-parser.py     |   42 +++++
 heat/engine/parser.py |  411 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 453 insertions(+)

commit d1daeb01d0acfa593e9d12026e3f02d1a99c9cf1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 22 10:18:43 2012 +1100

    Record events and retrieve them via "heat events_list <stack_name>"
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat                       |   19 ++++++++++++++
 heat/api/v1/__init__.py        |    2 ++
 heat/api/v1/stacks.py          |   14 +++++++++++
 heat/client.py                 |    8 ++++++
 heat/engine/api/v1/__init__.py |    6 +++++
 heat/engine/api/v1/events.py   |   54 ++++++++++++++++++++++++++++++++++++++++
 heat/engine/api/v1/stacks.py   |    6 ++---
 heat/engine/capelistener.py    |   54 +++++++++++++++++++++++++++++++++++-----
 heat/engine/client.py          |   10 ++++++--
 heat/engine/simpledb.py        |   46 ++++++++++++++++++++++++++++++++++
 10 files changed, 208 insertions(+), 11 deletions(-)

commit 4cea0f15890b88bd2c12effb1f7a5ea30642dc68
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 22 10:05:26 2012 +1100

    tweak the templates so the defaults are actually what we want.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/WordPress_Single_Instance.template |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit 8693984a9b8b905977b3a21ba946707870216796
Author: Steven Dake <sdake@redhat.com>
Date:   Wed Mar 21 11:32:41 2012 -0700

    Use full distro-arch as name of image registered with glance
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit faddc4daaebcefa4c92d7b8fe2f9c4ea8cf66633
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Mar 21 17:24:53 2012 +0100

    Properly handle templates of invalid format
    
    Fixes #19
    
    When we receive a template that's not in JSON, we display a meaningful message
    instead of a stacktrace.

 heat/api/v1/stacks.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 8acb771bb9a80ad87ddd69ba5e9b276d2405e33d
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Mar 21 17:07:14 2012 +0100

    Display error message on invalid template URL
    
    Fixes #19

 heat/api/v1/stacks.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 53859a38cac8df4a4a6c57b6ac6a95becc2549b5
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Wed Mar 21 16:41:54 2012 +0100

    Display message on heat-api and heat-engine startup
    
    When a Heat server is started, the user will now see a message that says so and
    shows the port number the server uses.

 bin/heat-api    |    4 +++-
 bin/heat-engine |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

commit 5d8d645f4e544bd92ec42bf7ca0c23cf464b5be4
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 21 10:52:54 2012 -0400

    Removed the *.log from the .gitignore so I can add the dummy files

 .gitignore              |    1 -
 var/log/heat/api.log    |    1 +
 var/log/heat/engine.log |    1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

commit d38de842e0e6e442c10cb4b367214cd4b295be24
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 21 10:14:00 2012 -0400

    Removing some of the cargo cult copy paste shrapnel

 docs/man/man1/heat.1 |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

commit 33c4b5f762dda0143dda38ebb1eb0fe318dee4fc
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Wed Mar 21 07:44:44 2012 -0400

    Adding rpm packaging for heat packages

 MANIFEST.in          |    3 ++
 Makefile             |   84 +++++++++++++++++++++++++++++
 docs/man/man1/heat.1 |   58 ++++++++++++++++++++
 heat.spec            |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++
 heat/version.py      |    4 +-
 setup.py             |    4 +-
 6 files changed, 296 insertions(+), 3 deletions(-)

commit 68d8778cca337a0a1119b0ead7cd7d48bf747b55
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 21 22:27:14 2012 +1100

    teach jeos_create about the debug option.
    
    Now this command produces lots of output (nice for debugging):
    sudo heat -d jeos_create F16 x86_64
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 175fa188316df8ef7d5528c575613948864d940b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 21 21:55:30 2012 +1100

    Improve the error checking in jeos_create
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat |   41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

commit f5e43a3ffca5d1ad0c2f9b510bf406d2d928aed2
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Mar 20 09:50:09 2012 -0400

    Updating template example github link

 .gitignore |    1 +
 README.rst |    3 +--
 bin/heat   |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

commit fb2227b804c31af6037e4618c741adee2edeb573
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Mar 20 07:26:40 2012 -0400

    Minor text edits

 README.rst |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 948212722397a89f574ce52d79bff798f43d179b
Author: Chris Alfonso <calfonso@redhat.com>
Date:   Tue Mar 20 07:16:06 2012 -0400

    Directives to not use variable names that conflict with pdb

 HACKING.rst |    2 +-
 pylintrc    |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 1b44c7d46d8b0645f0368dad4938a55c5e6935e1
Author: Tomas Sedovic <tomas@sedovic.cz>
Date:   Tue Mar 20 11:19:01 2012 +0100

    Fix a module import failure
    
    Running heat-api resulted in:
    
    heat.common.exception.ImportFailure: Failed to import requested object/class:
        'heat.api.v1.API'. Reason: No module named openstack.common

 heat/engine/client.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 49ed27480e4ac97a7d233fafbe60fa2eda0ff7fd
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 20 13:17:17 2012 +1100

    Fix README bullets
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 README.rst |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit 2f041a999f318b3f8ac055ca56f6268def915a96
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 20 13:14:02 2012 +1100

    Fix README headings
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 README.rst |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 939ee8d1a8f73350646444bea8326bb437e25819
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 20 13:11:53 2012 +1100

    Update the README
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 README.rst |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit 6161c7aa85023e1ea5b3acabd74f354f4e685116
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 19 21:25:20 2012 +1100

    Start separating the api and the implementation.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat                                 |    4 +-
 bin/heat-engine                          |   50 ++++
 etc/heat-api-paste.ini                   |    2 +-
 etc/heat-engine-paste.ini                |   36 +++
 etc/heat-engine.conf                     |   25 ++
 heat/api/v1/__init__.py                  |   37 ++-
 heat/api/v1/router.py                    |   51 ----
 heat/api/v1/stacks.py                    |  403 +++---------------------------
 heat/client.py                           |   14 +-
 heat/cloudformations.py                  |   19 ++
 heat/engine/__init__.py                  |   17 ++
 heat/engine/api/__init__.py              |   15 ++
 heat/engine/api/v1/__init__.py           |   32 +++
 heat/engine/api/v1/stacks.py             |  128 ++++++++++
 heat/engine/capelistener.py              |   61 +++++
 heat/engine/client.py                    |  167 +++++++++++++
 heat/engine/json2capexml.py              |  234 +++++++++++++++++
 heat/engine/systemctl.py                 |   52 ++++
 heat/tests/__init__.py                   |   18 ++
 heat/tests/unit/__init__.py              |   13 +
 heat/tests/unit/test_template_convert.py |   41 +++
 run_tests.py                             |  293 ++++++++++++++++++++++
 run_tests.sh                             |   79 ++++++
 setup.py                                 |   25 +-
 24 files changed, 1359 insertions(+), 457 deletions(-)

commit 4abbc9393e32322eee11bfe6b8f6d49a0733c0ca
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 20 12:01:37 2012 +1100

    fix delete params (was treated as body)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/client.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c7a01f18ad17080c75c68106c7cede968c34b0f7
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 19 17:58:39 2012 -0700

    Update readme with correct "raw" url for template
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 README.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a7025cdeb504463a1db08a37c821e045d90d76cd
Author: Steven Dake <sdake@redhat.com>
Date:   Mon Mar 19 17:10:58 2012 -0700

    Remove erroneous setup operation
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 README.rst |    1 -
 bin/heat   |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

commit c1e3fea7a65624f2af272db248514fe5a338254c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 20 11:08:24 2012 +1100

    Install config files properly.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 setup.py |    1 +
 1 file changed, 1 insertion(+)

commit 2cf38556bf1d7c07d8e0c5090a5dbd9ade11abbb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 19 22:46:46 2012 +1100

    Rename the etc/ files to what they need to be.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 etc/heat-api      |   25 -------------------------
 etc/heat-api.conf |   25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)

commit 248a69358101713b761fe08b82c8d1374740b2be
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 19 22:51:55 2012 +1100

    Pretty up the README
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 README     |   24 ------------------------
 README.rst |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 24 deletions(-)

commit d3ca2e3d37a08f0f8dd07fc8da7b48c64c6aaa33
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Mon Mar 19 22:44:25 2012 +1100

    Add etc to the manifest
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

commit d67fcf180d31e194d62fafd93cacbde7d442315b
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Mar 18 21:55:19 2012 -0700

    Add a jeos create operation using oz
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 bin/heat |  100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 99 insertions(+), 1 deletion(-)

commit 61c12cfebbb20ea9666db7f2524d6831064e68ee
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Mar 18 20:24:23 2012 -0700

    Updated README with install directions
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 README |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit aa68472a382ee85103b04dd94053be093a8a3c3a
Author: Steven Dake <sdake@redhat.com>
Date:   Sun Mar 18 20:20:41 2012 -0700

    Add MANIFEST.in and add a oz tdl for a F16 jeos
    
    Signed-off-by: Steven Dake <sdake@redhat.com>

 MANIFEST.in                        |    7 +++++
 heat/jeos/F16-x86_64-gold-jeos.tdl |   57 ++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

commit 5635b453b4d7dc682bf4dbb0602714402fd0d94d
Merge: d725691 cdc7f5a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 15:09:41 2012 -0700

    Merge pull request #12 from markmc/sync-cfg-from-openstack-common
    
    Sync cfg from openstack-common

commit d7256915aaca3e4839af0ccd73dccf01170e0695
Merge: 0141f6d 4e4126b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 15:05:30 2012 -0700

    Merge pull request #11 from markmc/unused-util-code
    
    Remove a bunch of unused util code
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

commit cdc7f5a49ca873021611f8320987292477a5e33e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Mar 16 11:47:07 2012 -0400

    Sync cfg from openstack-common
    
    Use openstack-common's update script to sync it to the latest.
    
    Add some dire warnings that changes should be made in the upstream
    copy of the code first.

 HACKING.rst                       |   15 +
 heat/__init__.py                  |   18 -
 heat/common/cfg.py                | 1135 -----------------------------------
 heat/common/config.py             |    2 +-
 heat/common/context.py            |    2 +-
 heat/common/wsgi.py               |    2 +-
 heat/openstack/common/README      |   13 +
 heat/openstack/common/__init__.py |   14 +
 heat/openstack/common/cfg.py      | 1200 +++++++++++++++++++++++++++++++++++++
 openstack-common.conf             |    7 +
 10 files changed, 1252 insertions(+), 1156 deletions(-)

commit 4e4126b9e57afd7bc8ae14b18df12c4b6b931610
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Mar 16 11:28:34 2012 -0400

    Remove a bunch of unused util code
    
    Eliminates the dependency on the iso8601 module.

 heat/common/utils.py |  294 --------------------------------------------------
 1 file changed, 294 deletions(-)

commit 0141f6da2fb8c1c4d8c71a57a39e2361581e0703
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 23:24:52 2012 +1100

    Add a cape event listener.
    
    For the moment just log the event, could do more
    with the events later.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

commit 0a26758da05efa5ba758dc620bc81d19da5a53d4
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 12:09:42 2012 +1100

    Catch errors better when creating the stack
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

commit a5fbf17743235d2fa5f7d5de77367ae953da450a
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 12:08:53 2012 +1100

    Remerge common code with glance.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/middleware/version_negotiation.py |    3 --
 heat/api/versions.py                       |    2 --
 heat/common/client.py                      |   46 ++++++++++++++++++++--------
 heat/common/config.py                      |    2 --
 heat/common/crypt.py                       |    2 --
 heat/common/exception.py                   |   21 +++++++++++++
 heat/common/utils.py                       |    9 +++---
 7 files changed, 59 insertions(+), 26 deletions(-)

commit 3fad43a5e21cab9338a481a87e517a7ec2b11598
Author: Ian Main <imain@redhat.com>
Date:   Thu Mar 15 17:15:05 2012 -0700

    Add config cp to README doc.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 README |    3 +++
 1 file changed, 3 insertions(+)

commit 072800e2c2af7303cbf6730f85f1be896e2a4e13
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 11:02:00 2012 +1100

    Don't crash if there is no "AWS::CloudFormation::Init" section.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py |   34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

commit 82888427f3efb57926dfb747d8923375599b5f7b
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 10:12:45 2012 +1100

    Move the default port number into common.config
    
    It was defined in multiple places.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat              |    7 +++----
 bin/heat-api          |    2 +-
 heat/client.py        |    1 -
 heat/common/config.py |    1 +
 4 files changed, 5 insertions(+), 6 deletions(-)

commit 0f6375a93130214fc656021f95af25eaed796d1c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Fri Mar 16 09:05:20 2012 +1100

    Change the default port references to DEFAULT_PORT
    
    If we need to change it again then this will make it easier.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat-api       |    2 +-
 heat/common/cfg.py |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

commit b987031f7c0a54ee8b6177195aae8b9595f44764
Author: Ian Main <imain@redhat.com>
Date:   Thu Mar 15 12:22:00 2012 -0700

    Fix missing paren.
    
    Signed-off-by: Ian Main <imain@redhat.com>

 heat/api/v1/stacks.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 077ff505d2d8930a3f52a19597826f8a7176a1b3
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 22:25:45 2012 +1100

    Add a call to start cape process.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

commit a76d02e790357258f8f57a5b33a0d2fe794a3714
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 22:24:42 2012 +1100

    Hook up the update and delete (not quite working)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/router.py |   11 +++++------
 heat/api/v1/stacks.py |    9 ++++++++-
 heat/client.py        |    9 +++++++--
 3 files changed, 20 insertions(+), 9 deletions(-)

commit a321e3c8801f8e945e5910ea52323ad5877c5187
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 21:34:43 2012 +1100

    Add a very rough-and-ready conversion from json to xml for cape
    
    This needs lots of improvements. And is only tested
    with templates/WordPress_Single_Instance.template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/stacks.py |  201 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 201 insertions(+)

commit a5ea8a4c558d38592d1ef93857485e4fb1cef884
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 21:22:05 2012 +1100

    Add support for getting the template via url else we get RequestUriTooLong
    
    The nutty cloudforms api passes the template in via parameters.
    TemplateUrl is better.
    
    try:
    ./bin/heat create my_stack --template-url=https://raw.github.com/asalkeld/heat/master/templates/WordPress_Single_Instance.template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/api/v1/__init__.py |    2 +-
 heat/api/v1/stacks.py   |   25 ++++++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

commit 97b6c95df0138b76dc1b75dd266f4d7c4ff37b70
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 16:49:50 2012 +1100

    Add missing RequestUriTooLong exception.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/common/client.py    |    2 ++
 heat/common/exception.py |    2 ++
 2 files changed, 4 insertions(+)

commit da35a068e9dc3fe6b33bce1ed7e6fc877b40d31c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 16:49:10 2012 +1100

    Fix the systemd service section in the template.
    
    To be consistent with the sysvinit one.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/WordPress_Single_Instance.template |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c0b95312c42aee27801f5d9d7e3680afeff35446
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 15:08:59 2012 +1100

    Add a disto mapping to get the image name.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/WordPress_Single_Instance.template |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

commit 83ba8d951939fe03329c388d614102e73a571a7e
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 13:43:15 2012 +1100

    Simplify the template more.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/WordPress_Single_Instance.template |  150 ++++----------------------
 1 file changed, 18 insertions(+), 132 deletions(-)

commit 7739de101e81246237fd899adf302f973eac705d
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 10:40:02 2012 +1100

    Add a simple single instance wordpress template
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 templates/WordPress_Single_Instance.template |  253 ++++++++++++++++++++++++++
 1 file changed, 253 insertions(+)

commit 2fde25bc115efbfaf4a953633be3bc1321aa2170
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Thu Mar 15 09:36:51 2012 +1100

    Remove openstack copy right assignment as we have not done that yet.
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 heat/__init__.py                           |    2 --
 heat/api/__init__.py                       |    2 --
 heat/api/middleware/__init__.py            |    2 --
 heat/api/middleware/context.py             |    2 --
 heat/api/middleware/version_negotiation.py |    2 --
 heat/api/v1/__init__.py                    |    2 --
 heat/api/v1/router.py                      |    2 --
 heat/api/v1/stacks.py                      |    2 --
 heat/api/versions.py                       |    2 --
 heat/client.py                             |    2 --
 heat/common/__init__.py                    |    2 --
 heat/common/auth.py                        |    2 --
 heat/common/client.py                      |    2 --
 heat/common/config.py                      |    2 --
 heat/common/context.py                     |    2 --
 heat/common/crypt.py                       |    2 --
 heat/common/exception.py                   |    1 -
 heat/common/policy.py                      |    2 --
 heat/common/wsgi.py                        |    1 -
 heat/version.py                            |    1 -
 setup.py                                   |    1 -
 21 files changed, 38 deletions(-)

commit fc413d93278706cc8e62f3033fdaf4815fc32784
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 14 13:02:53 2012 +1100

    Add a simple in-memory "db" so we can create/list stacks
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat              |    6 +-
 heat/api/v1/router.py |    2 +-
 heat/api/v1/stacks.py |  184 +++++++++++++++++++++++++++----------------------
 heat/client.py        |    4 +-
 4 files changed, 106 insertions(+), 90 deletions(-)

commit 41d167c5609a3a67715004cd006eef1aedee4beb
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Wed Mar 14 09:25:54 2012 +1100

    Add setup.py and friends
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .gitignore  |    1 +
 HACKING.rst |  186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 babel.cfg   |    1 +
 setup.cfg   |   24 ++++++++
 setup.py    |  108 ++++++++++++++++++++++++++++++++++
 5 files changed, 320 insertions(+)

commit 38de4d2564b75316ef5a61eb0b1a87b22a19731c
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 13 22:27:42 2012 +1100

    Add simple readme
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 README |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit ca303152e64c87610723a934a2a4623d2fa062f1
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 13 22:20:40 2012 +1100

    Fix Parameters
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 bin/heat              |   18 +++++++++++++++++-
 heat/api/v1/stacks.py |    6 +++---
 heat/common/client.py |   15 +++++++--------
 3 files changed, 27 insertions(+), 12 deletions(-)

commit 3b9c41fb6ccdd0e48d22d43ed4855ff03e0fdc88
Author: Angus Salkeld <asalkeld@redhat.com>
Date:   Tue Mar 13 21:48:07 2012 +1100

    Initial commit (basics copied from glance)
    
    Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

 .gitignore                                 |    6 +
 LICENSE                                    |  176 +++++
 bin/heat                                   |  377 +++++++++
 bin/heat-api                               |   54 ++
 etc/heat-api                               |   25 +
 etc/heat-api-paste.ini                     |   80 ++
 heat/__init__.py                           |   20 +
 heat/api/__init__.py                       |   16 +
 heat/api/middleware/__init__.py            |   16 +
 heat/api/middleware/context.py             |   64 ++
 heat/api/middleware/version_negotiation.py |  123 +++
 heat/api/v1/__init__.py                    |   21 +
 heat/api/v1/router.py                      |   54 ++
 heat/api/v1/stacks.py                      |  157 ++++
 heat/api/versions.py                       |   68 ++
 heat/client.py                             |  133 ++++
 heat/common/__init__.py                    |   16 +
 heat/common/auth.py                        |  267 +++++++
 heat/common/cfg.py                         | 1135 ++++++++++++++++++++++++++++
 heat/common/client.py                      |  593 +++++++++++++++
 heat/common/config.py                      |  184 +++++
 heat/common/context.py                     |  124 +++
 heat/common/crypt.py                       |   70 ++
 heat/common/exception.py                   |  193 +++++
 heat/common/policy.py                      |  182 +++++
 heat/common/utils.py                       |  372 +++++++++
 heat/common/wsgi.py                        |  649 ++++++++++++++++
 heat/version.py                            |   46 ++
 pylintrc                                   |   27 +
 templates/getting_started.template         |   40 +
 30 files changed, 5288 insertions(+)