]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
12 years agoUpdate GettingStarted with link to prebuilt images
sdake [Wed, 20 Feb 2013 21:37:32 +0000 (14:37 -0700)]
Update GettingStarted with link to prebuilt images

Update prebuilt images usage instructions

Show how to register the prebuilt image with glance

Change-Id: I27d032644dc7062a9cb5c88ed95c08ed146a3665

12 years agoMerge "heat engine : Add support rollback support for stack updates"
Jenkins [Wed, 20 Feb 2013 19:37:29 +0000 (19:37 +0000)]
Merge "heat engine : Add support rollback support for stack updates"

12 years agoMerge "heat engine : Update stack dependencies during update"
Jenkins [Wed, 20 Feb 2013 19:33:44 +0000 (19:33 +0000)]
Merge "heat engine : Update stack dependencies during update"

12 years agoMerge "heat engine : fail update immediately on resource update failure"
Jenkins [Wed, 20 Feb 2013 19:33:36 +0000 (19:33 +0000)]
Merge "heat engine : fail update immediately on resource update failure"

12 years agoMerge "heat common : Add ResourceUpdateFailed exception type"
Jenkins [Wed, 20 Feb 2013 18:55:23 +0000 (18:55 +0000)]
Merge "heat common : Add ResourceUpdateFailed exception type"

12 years agoMerge "Add config for boto https_validate_certificates"
Jenkins [Wed, 20 Feb 2013 17:49:04 +0000 (17:49 +0000)]
Merge "Add config for boto https_validate_certificates"

12 years agoheat engine : Add support rollback support for stack updates
Steven Hardy [Wed, 20 Feb 2013 15:34:48 +0000 (15:34 +0000)]
heat engine : Add support rollback support for stack updates

Adds support for rolling back failed stack updates

blueprint update-rollback

Change-Id: Ie90e37751365a8ef0ed24757c15f4020ee33ab8a

12 years agoheat engine : Update stack dependencies during update
Steven Hardy [Wed, 20 Feb 2013 15:16:53 +0000 (15:16 +0000)]
heat engine : Update stack dependencies during update

We need to update the stack dependencies each time we modify the
resources list, otherwise in the event of a failure, the resources
returned from the iterator methods don't match with those found via
getitem/contains (which is important for rollback)

blueprint update-rollback

Change-Id: Ia47f84291f50c33fc052b7b33fa0c1f9e8430ab4

12 years agoheat engine : fail update immediately on resource update failure
Steven Hardy [Wed, 20 Feb 2013 10:24:06 +0000 (10:24 +0000)]
heat engine : fail update immediately on resource update failure

When doing an update, we want to fail immediately, instead of
collecting the resource update errors and continuing.  This is
particularly important for update rollback, where we want to
declare failure ASAP to simplify and speed up the rollback

blueprint update-rollback

Change-Id: I56133254036d8aac592dcf3cda2ca7928cc02fa9

12 years agoheat common : Add ResourceUpdateFailed exception type
Steven Hardy [Tue, 19 Feb 2013 18:34:35 +0000 (18:34 +0000)]
heat common : Add ResourceUpdateFailed exception type

blueprint update-rollback

Change-Id: I357f9f5b7db727f968ab385c9da8042e5dce7154

12 years agoMerge "heat engine : avoid returning empty resource error strings"
Jenkins [Tue, 19 Feb 2013 21:29:57 +0000 (21:29 +0000)]
Merge "heat engine : avoid returning empty resource error strings"

12 years agoMerge "Missing policy json files from tarball"
Jenkins [Tue, 19 Feb 2013 21:26:05 +0000 (21:26 +0000)]
Merge "Missing policy json files from tarball"

12 years agoAdd config for boto https_validate_certificates
Clint Byrum [Tue, 19 Feb 2013 20:21:07 +0000 (12:21 -0800)]
Add config for boto https_validate_certificates

Boto does not, by default, validate https ceritificates on endpoints. We
now provide a way to specify it in the heat configuration along side
is_secure. Heat deployers may also need to turn this off if boto ever
does make it default and they want to use self signed certs.

Fixes bug #1130345

Change-Id: I09b684dd28a8a57c6ce514d1df1e699e7c8b182e

12 years agoMerge "Use 2013.1 for Grizzly release version info in setup.py"
Jenkins [Tue, 19 Feb 2013 19:02:30 +0000 (19:02 +0000)]
Merge "Use 2013.1 for Grizzly release version info in setup.py"

12 years agoheat engine : avoid returning empty resource error strings
Steven Hardy [Tue, 19 Feb 2013 18:17:02 +0000 (18:17 +0000)]
heat engine : avoid returning empty resource error strings

Avoid the possibility of returning an empty string (when Exceptions
have not got a string message), or parser.py will treat the error
as success and the resource operation failure will not be correctly
reflected in the resource state.

fixes bug 1130270

Change-Id: I1c55dea1f9615cd4b037802ff8c1066694bffea6

12 years agoMissing policy json files from tarball
sdake [Tue, 19 Feb 2013 15:55:08 +0000 (08:55 -0700)]
Missing policy json files from tarball

The tarball is missing files:
heat/tests/policy/deny_stack_user.json
heat/tests/policy/notallowed.json

Fixes: bug #1130119
Change-Id: I4614c759044e0eedb9dab5f7cbe8d71f4cbdc38e

12 years agoheat engine : Implement rollback for stack create
Steven Hardy [Thu, 14 Feb 2013 16:17:25 +0000 (16:17 +0000)]
heat engine : Implement rollback for stack create

Implement stack rollback for create_stack, so if a stack
creation fails we automatically rollback (ie delete) the
stack

NOTE : this option defaults to on, so use the --disable-rollback
option to the CLI tools if you want to disable this feature

blueprint stack-rollback

Change-Id: I70a3822426706d0787e571517e059baff1406c0f

12 years agoheat engine : Only create periodic task on CREATE_COMPLETE
Steven Hardy [Fri, 15 Feb 2013 18:31:13 +0000 (18:31 +0000)]
heat engine : Only create periodic task on CREATE_COMPLETE

Only create the stack periodic watcher task if the stack create
completed successfully, since we don't want a watcher task if
the stack ended up rolling back (or just in CREATE_FAILED state)

Change-Id: I5592fa106f740eb2e1dcf40e98a2656627715b6f

12 years agomake stack_delete_after decorator tolerate deleted stacks
Steven Hardy [Mon, 18 Feb 2013 19:40:09 +0000 (19:40 +0000)]
make stack_delete_after decorator tolerate deleted stacks

Make the stack_delete_after decorator try/except so it doesn't cause a
test failure if the test has already done a delete during the test

Change-Id: I4a5e096478ece0de02cc910366a5d361d5ee45e0

12 years agoMerge "Provide unit test coverage for AWS::EC2::SecurityGroup"
Jenkins [Tue, 19 Feb 2013 00:55:29 +0000 (00:55 +0000)]
Merge "Provide unit test coverage for AWS::EC2::SecurityGroup"

12 years agoUse 2013.1 for Grizzly release version info in setup.py
sdake [Tue, 19 Feb 2013 00:25:34 +0000 (17:25 -0700)]
Use 2013.1 for Grizzly release version info in setup.py

setup.py does not have a default version number specified.

Fixes Bug: #1129620

Change-Id: I4fd0ae02ad445aa1bdd25a67aead1e52fd731e3e

12 years agoProvide unit test coverage for AWS::EC2::SecurityGroup
Steve Baker [Mon, 18 Feb 2013 23:55:09 +0000 (12:55 +1300)]
Provide unit test coverage for AWS::EC2::SecurityGroup

There were some issues that testing revealed, includes fixes
for those.

Fixes bug 1129577

Change-Id: I31b02c7fc9179b61b74dd18a38e15d126b406f80

12 years agoheat cli : Add --disable-rollback option to heat-cfn
Steven Hardy [Thu, 14 Feb 2013 16:16:09 +0000 (16:16 +0000)]
heat cli : Add --disable-rollback option to heat-cfn

When rollback is implemented it will default on, like aws
so this option allows stack rollback on create to be disabled

blueprint stack-rollback

Change-Id: I02fcaaa656219b1c65729cecdd473e0a5bd86036

12 years agoheat tests : delete stacks from DB in parser tests
Steven Hardy [Thu, 14 Feb 2013 15:41:14 +0000 (15:41 +0000)]
heat tests : delete stacks from DB in parser tests

The tests which store a stack in the DB should delete it
at the end of the test, otherwise any cut/paste test
which uses the same stack name will always fail

Change-Id: Ib2e26480924bfe65a2f6fe8ae55076466394bcee

12 years agoheat api : Handle DisableRollback parameter in cfn API
Steven Hardy [Wed, 13 Feb 2013 15:59:05 +0000 (15:59 +0000)]
heat api : Handle DisableRollback parameter in cfn API

Previously we ignored DisableRollback for create/update,
pass it to the engine since the engine API now supports it

blueprint stack-rollback

Change-Id: I926d843a88449fa61b665bd1b47946724f6d2ce5

12 years agomake engine api handle string or bool disable_rollback
Steven Hardy [Mon, 18 Feb 2013 20:01:42 +0000 (20:01 +0000)]
make engine api handle string or bool disable_rollback

Allow API's to pass string or bool format True/False flag
for the disable_rollback argument to the engine RPC API

Change-Id: I1886263ac2487c4cb36c8bd93fd1d09b04abe813

12 years agoMerge "Add information about using the python-heatclient to the documentation"
Jenkins [Mon, 18 Feb 2013 20:17:36 +0000 (20:17 +0000)]
Merge "Add information about using the python-heatclient to the documentation"

12 years agoMerge "Implement RouteTable and subnet association"
Jenkins [Mon, 18 Feb 2013 19:49:45 +0000 (19:49 +0000)]
Merge "Implement RouteTable and subnet association"

12 years agoAdd information about using the python-heatclient to the documentation
sdake [Sat, 16 Feb 2013 21:12:24 +0000 (14:12 -0700)]
Add information about using the python-heatclient to the documentation

Adds information about using python-heatclient.

Fixes Bug: #127498

Change-Id: I77d161a5a7c8f0bed9653681d8f4b5aa513e7086

12 years agoMerge "heat engine : Add support for disable_rollback to engine API"
Jenkins [Mon, 18 Feb 2013 17:58:11 +0000 (17:58 +0000)]
Merge "heat engine : Add support for disable_rollback to engine API"

12 years agoMerge "Make AvailabilityZone parameter available to nova create"
Jenkins [Mon, 18 Feb 2013 17:48:24 +0000 (17:48 +0000)]
Merge "Make AvailabilityZone parameter available to nova create"

12 years agoMake AvailabilityZone parameter available to nova create
Jeff Peeler [Fri, 15 Feb 2013 15:57:46 +0000 (10:57 -0500)]
Make AvailabilityZone parameter available to nova create

Looks for the AvailabilityZone property in the instance's
resource section. For example:

"Resources" : {
  "Properties": {
    "AvailabilityZone" : "nova",
...

Fixes bug #1096006

Change-Id: I3333b5f909b27e53f6985713de58dd30efc1a80a
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoheat engine : Add support for disable_rollback to engine API
Steven Hardy [Wed, 13 Feb 2013 15:40:30 +0000 (15:40 +0000)]
heat engine : Add support for disable_rollback to engine API

Adds support for a disable_rollback parameter to the engine API
which will allow us to control rollback of create/update

blueprint stack-rollback

Change-Id: I832f26c917d8fc178b925ce49a2366faf6e3dc0e
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoImplement RouteTable and subnet association
Steve Baker [Sun, 17 Feb 2013 20:12:12 +0000 (09:12 +1300)]
Implement RouteTable and subnet association

Implements blueprint resource-type-routetable
and blueprint resource-type-srta

Change-Id: Idb6e8d060563d22847d100220e9a1750340583a8

12 years agoImplement Internet Gateway and VPC attachment
Steve Baker [Wed, 13 Feb 2013 21:05:11 +0000 (10:05 +1300)]
Implement Internet Gateway and VPC attachment

Please note that this takes a different approach for
all VPC resources types. Previously the resource_id matched
the underlying quantum resource UUID (or a composite of the
underlying UUIDs)

This had some problems, including:
- it was resource_id abuse
- it required extra quantum _list and _show calls to get enough
  data to wire up new resources
- it made the already difficult job of mapping VPC <-> quantum
  even harder

The new approach is to store all quantum UUIDs in resource metadata.
The resource id is just the resource name, so resources can easily
fetch other resources from the stack by ref/name then look up
their metadata to find the underlying quantum UUIDs to perform
operations with.

Implements blueprint resource-type-internetgateway

Change-Id: I69937254566b74f173439b3c5ce4c4e8d8c49afa

12 years agoEscape awk + sign so heat-keystone-setup works on Ubuntu 12.04
sdake [Fri, 15 Feb 2013 23:25:34 +0000 (16:25 -0700)]
Escape awk + sign so heat-keystone-setup works on Ubuntu 12.04

plus sign needs escaping

Change-Id: Ia03f1eb213c806d13e88a435023ede8511ddfa4f
Fixes: bug #126723
12 years agoComplete tests for NetworkInterface
Steve Baker [Thu, 14 Feb 2013 00:10:24 +0000 (13:10 +1300)]
Complete tests for NetworkInterface

Previous test was lacking some coverage, and had a hidden error.

Change-Id: I7cd3c98a3b89eef4f84f0e52701ab7f7fccc61f2

12 years agoMerge "Use physical_resource_name for quantum/vpc resources."
Jenkins [Wed, 13 Feb 2013 21:33:45 +0000 (21:33 +0000)]
Merge "Use physical_resource_name for quantum/vpc resources."

12 years agoMerge "ip_version is mandatory for quantum create_subnet"
Jenkins [Wed, 13 Feb 2013 21:33:38 +0000 (21:33 +0000)]
Merge "ip_version is mandatory for quantum create_subnet"

12 years agoMerge "Implement VPC Network Interface resource"
Jenkins [Wed, 13 Feb 2013 21:33:19 +0000 (21:33 +0000)]
Merge "Implement VPC Network Interface resource"

12 years agoMerge "Add Tags to vpc properties schema (Unimplemented)"
Jenkins [Wed, 13 Feb 2013 21:01:13 +0000 (21:01 +0000)]
Merge "Add Tags to vpc properties schema (Unimplemented)"

12 years agoFix policy checks for users without policies
Tomas Sedovic [Wed, 13 Feb 2013 10:10:53 +0000 (11:10 +0100)]
Fix policy checks for users without policies

When the User resource doesn't have the `Policies` property specified,
the policy checking code raised an error because it tried to iterate
over `None`.

Change-Id: I1ad0a051c837744d8ec0a343929918c92fa78437
Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
12 years agoUse physical_resource_name for quantum/vpc resources.
Steve Baker [Tue, 12 Feb 2013 00:15:47 +0000 (13:15 +1300)]
Use physical_resource_name for quantum/vpc resources.

This give a bit more namespace seperation for quantum resource names.

Change-Id: I72736b4409937eb8511ef94dc58407aed20a0f67

12 years agoip_version is mandatory for quantum create_subnet
Steve Baker [Wed, 13 Feb 2013 00:46:12 +0000 (13:46 +1300)]
ip_version is mandatory for quantum create_subnet

Change-Id: I6e0e0afc5d825c00c4b4ecafa893c8a582faadc7

12 years agoImplement VPC Network Interface resource
Steve Baker [Tue, 12 Feb 2013 20:44:37 +0000 (09:44 +1300)]
Implement VPC Network Interface resource

Implements blueprint resource-type-networkinterface

Change-Id: I90f0c1ef41d457e595ac662d26eeadeae4ec81c7

12 years agoAdd Tags to vpc properties schema (Unimplemented)
Steve Baker [Tue, 12 Feb 2013 22:04:58 +0000 (11:04 +1300)]
Add Tags to vpc properties schema (Unimplemented)

Change-Id: I9889c502837d666e25297634f77116f40d4deea8

12 years agoMerge "Impement VPC subnet resource"
Jenkins [Tue, 12 Feb 2013 21:49:54 +0000 (21:49 +0000)]
Merge "Impement VPC subnet resource"

12 years agoImpement VPC subnet resource
Steve Baker [Sun, 2 Dec 2012 20:00:22 +0000 (09:00 +1300)]
Impement VPC subnet resource

Implements blueprint resource-type-subnet

Change-Id: I870e69249b591f9724b3a9c7bf076853a4eb880a

12 years agoheat templates : allow access to wordpress in example templates
Steven Hardy [Tue, 12 Feb 2013 16:02:44 +0000 (16:02 +0000)]
heat templates : allow access to wordpress in example templates

Latest wordpress package in Fedora defaults to deny-all so trying
to access the wordpress site on the instance no longer works,
so sed out the deny all to allow template examples and integration
tests to work again

Fixes bug 1123053

Change-Id: I7597e4f491426e639c4c19a92f610c8a693dc1f3
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoMerge "Make the doc look a bit better and give a better overview."
Jenkins [Tue, 12 Feb 2013 15:51:44 +0000 (15:51 +0000)]
Merge "Make the doc look a bit better and give a better overview."

12 years agoMerge "Implement NetworkInterfaces instance property."
Jenkins [Tue, 12 Feb 2013 15:51:08 +0000 (15:51 +0000)]
Merge "Implement NetworkInterfaces instance property."

12 years agoMerge "Catch 404s when deleting quantum resources."
Jenkins [Tue, 12 Feb 2013 15:49:31 +0000 (15:49 +0000)]
Merge "Catch 404s when deleting quantum resources."

12 years agoMerge "Implement the "Volumes" property of Instances"
Jenkins [Tue, 12 Feb 2013 15:47:02 +0000 (15:47 +0000)]
Merge "Implement the "Volumes" property of Instances"

12 years agoMerge "Refactor loguserdata.py so it can be tested."
Jenkins [Tue, 12 Feb 2013 15:42:56 +0000 (15:42 +0000)]
Merge "Refactor loguserdata.py so it can be tested."

12 years agoImplement the "Volumes" property of Instances
Angus Salkeld [Tue, 12 Feb 2013 06:53:56 +0000 (17:53 +1100)]
Implement the "Volumes" property of Instances

This moves the attachment code to clients so both instance
and volume can use it.

bug: 1101119
Change-Id: Id412110ceb74b3b5316f591d03898312691f2a3e

12 years agoMerge "heat engine : add option to control instance boto http/https"
Jenkins [Mon, 11 Feb 2013 15:50:31 +0000 (15:50 +0000)]
Merge "heat engine : add option to control instance boto http/https"

12 years agoMerge "Add update support to InstanceGroup"
Jenkins [Mon, 11 Feb 2013 10:47:03 +0000 (10:47 +0000)]
Merge "Add update support to InstanceGroup"

12 years agoMerge "Depend on WebOb==1.2.3 to align with other OS projects"
Jenkins [Mon, 11 Feb 2013 09:47:58 +0000 (09:47 +0000)]
Merge "Depend on WebOb==1.2.3 to align with other OS projects"

12 years agoMake the doc look a bit better and give a better overview.
Angus Salkeld [Mon, 11 Feb 2013 03:49:21 +0000 (14:49 +1100)]
Make the doc look a bit better and give a better overview.

(styles mostly copied from Ceilometer docs)

Change-Id: Ie3eab4f579e0c16a09634faffb90e96a872d5d84

12 years agoAdd update support to InstanceGroup
Angus Salkeld [Mon, 11 Feb 2013 03:44:45 +0000 (14:44 +1100)]
Add update support to InstanceGroup

Change-Id: Ie4d554f7440d06d408f71ff1b223d34d50b655bc

12 years agoImplement NetworkInterfaces instance property.
Steve Baker [Mon, 11 Feb 2013 01:31:09 +0000 (14:31 +1300)]
Implement NetworkInterfaces instance property.

This accepts a list of strings, where each string will be a Ref
to either a OS::Quantum::Port or a (yet to be implemented)
AWS::EC2::NetworkInterface.

This fixes bug 1096013

Change-Id: Ic8aecf8d59395edcf111b3a778e79762af0e50d4

12 years agoCatch 404s when deleting quantum resources.
Steve Baker [Mon, 11 Feb 2013 01:34:32 +0000 (14:34 +1300)]
Catch 404s when deleting quantum resources.

Quantum resources are often automatically deleted when their
dependencies are deleted, so resource deletion needs to tolerate
the resource no longer being there.

Change-Id: Id2679a7b72b83f05c1ebac07305ae9a5e5923df9

12 years agoMerge "Remove sendfile as a dependency."
Jenkins [Mon, 11 Feb 2013 02:41:12 +0000 (02:41 +0000)]
Merge "Remove sendfile as a dependency."

12 years agoMerge "heat clients : Make boto client select http/https from configfile"
Jenkins [Mon, 11 Feb 2013 02:37:37 +0000 (02:37 +0000)]
Merge "heat clients : Make boto client select http/https from configfile"

12 years agoImplement simple AccessPolicy Resource
Steven Hardy [Tue, 5 Feb 2013 14:07:14 +0000 (14:07 +0000)]
Implement simple AccessPolicy Resource

Implement a simple AccessPolicy resource, which can be used
to restrict in-instance users to specific resources when they
call the DescribeStackResource API action

Fixes bug 1115758

Signed-off-by: Steven Hardy <shardy@redhat.com>
Change-Id: Idc98531388e535ce16308fd5aab5ceecda1de682

12 years agoheat templates : Remove IAM Policy sections
Steven Hardy [Thu, 7 Feb 2013 15:54:42 +0000 (15:54 +0000)]
heat templates : Remove IAM Policy sections

Some templates have Policies specified for the User
resource in the AWS IAM Policy format, which we do
not yet support, and will confuse users now we have
OS::Heat::AccessPolicy implemented

ref bug 1115758

Change-Id: I6958b02fe6518ea43729ebc18818524ae7e4921e
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : split user test into User/AccessKey
Steven Hardy [Thu, 7 Feb 2013 15:33:17 +0000 (15:33 +0000)]
heat tests : split user test into User/AccessKey

The test is testing two classes, User and AccessKey,
so make the tests separate

Change-Id: I79e183381ce69e2d2d564c254b2f903b60672e33
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat engine : add option to control instance boto http/https
Steven Hardy [Fri, 8 Feb 2013 11:39:17 +0000 (11:39 +0000)]
heat engine : add option to control instance boto http/https

Currently the heat-jeos code defaults to http only, but we are
about to fix that, so we instead need a way to specify if
instances should connect via http or https - boto provides the
is_secure config file option, so add a new heat option which
controls this setting in the boto config we create in userdata

fixes bug 1117594

Change-Id: I0b9201107570334d9846d9613d252da1a91efe8a
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat clients : Make boto client select http/https from configfile
Steven Hardy [Fri, 8 Feb 2013 11:34:58 +0000 (11:34 +0000)]
heat clients : Make boto client select http/https from configfile

Currently we hardcode is_secure=False, but boto supports configuration
of this option from the config file (either ~/.boto or /etc/boto.cfg)
so better to do that

NOTE - you will need to update your boto config to include is_secure=0
to retain current (non https) behavior, since it defaults to on

ref bug 1117594

Change-Id: Ic13e8604f12d3d5be4ec132a1bc04ae7624ec85d
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoMerge "heat api : Add policy.json authorization to cloudwatch API"
Jenkins [Fri, 8 Feb 2013 02:22:14 +0000 (02:22 +0000)]
Merge "heat api : Add policy.json authorization to cloudwatch API"

12 years agoMerge "heat scripts : Avoid using lsb_release in tools/openstack"
Jenkins [Thu, 7 Feb 2013 16:40:26 +0000 (16:40 +0000)]
Merge "heat scripts : Avoid using lsb_release in tools/openstack"

12 years agoheat scripts : Avoid using lsb_release in tools/openstack
Steven Hardy [Thu, 7 Feb 2013 11:16:28 +0000 (11:16 +0000)]
heat scripts : Avoid using lsb_release in tools/openstack

lsb_release is not installed by default on Fedora (or at least
it's not on my F17 box), so we should avoid using it, simple
alternative is just to read /etc/fedora-release instead

Change-Id: I341c151e8560fb971b11d27578934940aeeca1a7
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoMerge "Add missing logging import"
Jenkins [Thu, 7 Feb 2013 11:07:29 +0000 (11:07 +0000)]
Merge "Add missing logging import"

12 years agoMerge "test_s3: use try_import from common"
Jenkins [Thu, 7 Feb 2013 10:56:30 +0000 (10:56 +0000)]
Merge "test_s3: use try_import from common"

12 years agoheat api : Add policy.json authorization to cloudwatch API
Steven Hardy [Wed, 6 Feb 2013 16:32:54 +0000 (16:32 +0000)]
heat api : Add policy.json authorization to cloudwatch API

Adds a basic policy.json to authorize all actions for the CW API -
this will deny access to the in-instance users defined in stack
templates (which are assigned the heat_stack_user role) to all API
actions apart from PutMetricData action, which is used by
cfn-push-stats to provide metric data from the instances

Change-Id: I2bbb885bec98b85828cdb92d7efc0688da7be3c1
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoDepend on WebOb==1.2.3 to align with other OS projects
Steve Baker [Thu, 7 Feb 2013 03:23:10 +0000 (16:23 +1300)]
Depend on WebOb==1.2.3 to align with other OS projects

Change-Id: Ic1b113a63a9fa44acf98efbe18783f5be5cbeada

12 years agoUse yaml.safe_load: full yaml.load isn't needed
Clint Byrum [Thu, 7 Feb 2013 00:27:23 +0000 (16:27 -0800)]
Use yaml.safe_load: full yaml.load isn't needed

The only reason to use yaml.load instead of safe_load is if one wants to
load serialized objects. Heat's use case is purely to load basic data
structures such as maps/lists/strings. Fixes bug #1117820

Change-Id: I4f6cf2ed4e15405f8b296ccaec737a3779c9867d

12 years agoAdd missing logging import
Angus Salkeld [Wed, 6 Feb 2013 23:13:02 +0000 (10:13 +1100)]
Add missing logging import

Change-Id: I863a4b69fe4d050165d304bbf630c57ce171b1bc

12 years agotest_s3: use try_import from common
Angus Salkeld [Wed, 6 Feb 2013 11:25:22 +0000 (22:25 +1100)]
test_s3: use try_import from common

Change-Id: I3055c3d2f8061b91b038286d8ff2c5cbdcd41efd

12 years agoMerge "heat api : Add policy.json authorization to CFN API"
Jenkins [Wed, 6 Feb 2013 22:02:55 +0000 (22:02 +0000)]
Merge "heat api : Add policy.json authorization to CFN API"

12 years agoMerge "heat common : context should split roles from X-Roles"
Jenkins [Wed, 6 Feb 2013 22:01:42 +0000 (22:01 +0000)]
Merge "heat common : context should split roles from X-Roles"

12 years agoRefactor loguserdata.py so it can be tested.
Steve Baker [Mon, 4 Feb 2013 21:10:11 +0000 (10:10 +1300)]
Refactor loguserdata.py so it can be tested.

- Use distutils.version.LooseVersion for cloud-init version check
- Fix bug 1100287 by setting the following modes:
  - 0600 /var/log/heat-provision.log
  - 0700 /var/lib/heat
  - 0700 /var/lib/cloud/data/cfn-userdata (was 0111!)
- Full test coverage except for where __name__ == '__main__'
- File size has gone from 1218 bytes to 1636. If necessary we could reduce size in the future by using short names

This works for me when launching a template. At least if there are any regressions they can have a test written for the fix.
Change-Id: I04e773a743ec210e90394e50d2bb70c70664e80e

12 years agoMerge "Add cinder support to resource volume"
Jenkins [Wed, 6 Feb 2013 19:31:54 +0000 (19:31 +0000)]
Merge "Add cinder support to resource volume"

12 years agoheat api : Add policy.json authorization to CFN API
Steven Hardy [Tue, 5 Feb 2013 19:23:38 +0000 (19:23 +0000)]
heat api : Add policy.json authorization to CFN API

Adds a basic policy.json to authorize all actions for the CFN API -
this will deny access to the in-instance users defined in stack
templates (which are assigned the heat_stack_user role) to all API
actions apart from DescribeStackResource, which is used for metadata
updates

ref bug 1115758

Change-Id: I1431c1f23593fffd0f911f71ef9c186a43e5063a
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat common : context should split roles from X-Roles
Steven Hardy [Wed, 6 Feb 2013 11:39:12 +0000 (11:39 +0000)]
heat common : context should split roles from X-Roles

The auth_token code joins roles with a comma delimiter and stores
the result in the X-Roles header, so we need to split X-Roles back
into a list for the context (otherwise the oslo policy code breaks)

Change-Id: I32bd1d6355b6fe0e16e729f35b1d0b5c61346a70
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : fix StackControllerTest name duplication
Steven Hardy [Wed, 6 Feb 2013 10:05:58 +0000 (10:05 +0000)]
heat tests : fix StackControllerTest name duplication

StackControllerTest appears twice in the run_tests.sh output,
since it's used for both the CFN and ReST API tests, so rename
the CFN testcase to make run_tests output less confusing

Change-Id: Iedf2e21ecd0b511eb93a11c2cf593dbfc1bcaca9
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : remove duplicate import
Steven Hardy [Tue, 5 Feb 2013 16:31:05 +0000 (16:31 +0000)]
heat tests : remove duplicate import

Change-Id: I20364f10041420d898e3255adcc12f3a8f53ed03
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoAdd cinder support to resource volume
Jeff Peeler [Mon, 28 Jan 2013 20:24:54 +0000 (15:24 -0500)]
Add cinder support to resource volume

Fixes bug #1073164

Change-Id: I190067e5ea9334e336e6f105222905b1d48408fd
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoAdd initial code to support policy.json implementation
Steven Hardy [Tue, 5 Feb 2013 19:21:00 +0000 (19:21 +0000)]
Add initial code to support policy.json implementation

We don't currently support a policy.json file like
other openstack services, so this code (mostly copied
from glance, then modified a bit) will allow us to
add policy-based authorization to out APIs fairly
easily

Change-Id: I5ad9f55b3d0979e2526953bdce8b8227852e4b72
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoupdate openstack common and include policy.py
Steven Hardy [Tue, 5 Feb 2013 14:18:05 +0000 (14:18 +0000)]
update openstack common and include policy.py

Sync with latest oslo (now at bd5d9f0), and update config to
pull in policy.py

Change-Id: I3571477cbf7c538c9ddb6860f85265ed503d2049
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoRemove unused heat/common/policy.py
Steven Hardy [Tue, 5 Feb 2013 14:09:00 +0000 (14:09 +0000)]
Remove unused heat/common/policy.py

Remove heat/common/policy.py, since we don't currently implement
policy filtering, and when we do we should use the oslo policy.py

Change-Id: I0c1d26ceed958d270f59edd612911ce24f74c1ff
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoFix a few bash logic errors in install script
Jeff Peeler [Tue, 5 Feb 2013 05:24:21 +0000 (00:24 -0500)]
Fix a few bash logic errors in install script

Slipped by in 0a37f56972714818fcf378945b0d3b91d1b8e10a

Change-Id: Id02454e8224f99b057cc8c9e92580ae6c26bc14e
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoRemove sendfile as a dependency.
Steve Baker [Tue, 5 Feb 2013 03:15:13 +0000 (16:15 +1300)]
Remove sendfile as a dependency.

This is dead code anyway, since heat-cfn doesn't handle large binary files like glance.

Fixes bug 1087530

Change-Id: Iaba7adce088b20136ece0828d4085679fcbab731

12 years agoMerge "Change install scripts to use cinder"
Jenkins [Tue, 5 Feb 2013 01:06:18 +0000 (01:06 +0000)]
Merge "Change install scripts to use cinder"

12 years agoMerge "Update to latest oslo-version code."
Jenkins [Tue, 5 Feb 2013 01:03:10 +0000 (01:03 +0000)]
Merge "Update to latest oslo-version code."

12 years agoFix typo in AutoScaling update
Angus Salkeld [Mon, 4 Feb 2013 22:12:51 +0000 (09:12 +1100)]
Fix typo in AutoScaling update

Change-Id: I2e96e6f71c3cb0b9ce73e57344e0eb4706b95f70

12 years agoChange install scripts to use cinder
Jeff Peeler [Fri, 25 Jan 2013 21:06:16 +0000 (16:06 -0500)]
Change install scripts to use cinder

Fixes bug #1073164

Change-Id: Id483b028d19dbbc30984299120b87fd020f19903
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoheat engine : AutoScalingGroup UpdateStack support
Steven Hardy [Mon, 4 Feb 2013 18:03:52 +0000 (18:03 +0000)]
heat engine : AutoScalingGroup UpdateStack support

Adds improved UpdateStack support for AutoScalingGroup,
now the following properties can be updated without
replacement:
'MaxSize', 'MinSize', 'Cooldown', 'DesiredCapacity'

Change-Id: Ic47b4a2456dc19cd91eec7b0381d5d82fcd3f332
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat engine : Resource add function to compare properties
Steven Hardy [Mon, 4 Feb 2013 14:09:04 +0000 (14:09 +0000)]
heat engine : Resource add function to compare properties

Add update_template_diff_properties to make comparison of
pre/post update resource properties easier

Change-Id: Ic37d37ae510a62739d4cc4219cfd69479a87767d
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : update_allowed_keys should be tuple
Steven Hardy [Mon, 4 Feb 2013 13:35:05 +0000 (13:35 +0000)]
heat tests : update_allowed_keys should be tuple

In test_resource.py update_allowed_keys should be a tuple not
a list, so it matches the expected usage in the resource classes

Change-Id: Ic7428e3790ea2c8c9887b464daf303c4f5d563fc
Signed-off-by: Steven Hardy <shardy@redhat.com>