]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
12 years agouses os.urandom instead of Crypto.Random for backward compatibility
Giulio Fidente [Thu, 11 Apr 2013 15:31:53 +0000 (17:31 +0200)]
uses os.urandom instead of Crypto.Random for backward compatibility

Crypto.Random has been introduced by pycrypto 2.1 but in RHEL6 and
derivates you will only find pycrypto 2.0.1

Change-Id: Ib601981b0b8fcb5b3e8fc8761ee05adf7f6574fa

12 years agoMerge "Update to the latest loopingcall from oslo."
Jenkins [Wed, 10 Apr 2013 06:43:07 +0000 (06:43 +0000)]
Merge "Update to the latest loopingcall from oslo."

12 years agoheat templates : Update Wordpress config for F18 guests
Steven Hardy [Tue, 9 Apr 2013 16:59:08 +0000 (17:59 +0100)]
heat templates : Update Wordpress config for F18 guests

F18 contains apache 2.4 which requires a different syntax to enable
non-local access to the wordpress install

fixes bug #1166897

Change-Id: Ia63cceeba35904f05a1b4cf76fc075d3cdc7cd86

12 years agoheat : Getting started updates for grizzly
Steven Hardy [Mon, 8 Apr 2013 17:20:43 +0000 (18:20 +0100)]
heat : Getting started updates for grizzly

Update GettingStarted to drop references to F16/essex and add the
password sed which is required when running grizzly installed via
tools/openstack on Fedora

Change-Id: I08d265e2e2388b54a6aa9f47c4930c32f71f3e93

12 years agoheat : cloudwatch paste.ini credentials incorrect
Steven Hardy [Mon, 8 Apr 2013 16:47:39 +0000 (17:47 +0100)]
heat : cloudwatch paste.ini credentials incorrect

The cloudwatch paste config should specify service/heat
like the other API services, not admin/admin

Change-Id: I0590c88edd6b544aba467ab171dd7f610b50c380

12 years agoheat tools : openstack script fixes for grizzly
Steven Hardy [Mon, 8 Apr 2013 16:46:38 +0000 (17:46 +0100)]
heat tools : openstack script fixes for grizzly

Update tools/openstack so it works with the grizzly preview repo
(tested on F18 with both grizzly repo and folsom distro packages)

fixes bug #1164605

Change-Id: I347a53c9be677131dad37f9fbeb1ed5eb9cb810b

12 years agoMerge "Remove paste config for non-existant cache filters"
Jenkins [Tue, 9 Apr 2013 05:35:05 +0000 (05:35 +0000)]
Merge "Remove paste config for non-existant cache filters"

12 years agoMerge "Remove unused and deprecated auth-context filter"
Jenkins [Tue, 9 Apr 2013 05:35:02 +0000 (05:35 +0000)]
Merge "Remove unused and deprecated auth-context filter"

12 years agoUpdate to the latest loopingcall from oslo.
Michael Still [Tue, 9 Apr 2013 05:05:30 +0000 (15:05 +1000)]
Update to the latest loopingcall from oslo.

This needs threadgroup as well, as it uses loopingcall.

Change-Id: Idfa68519c9e263830c9e6a16c2e1bfbd8c89069d

12 years agoRemove paste config for non-existant cache filters
Steve Baker [Fri, 5 Apr 2013 02:55:31 +0000 (15:55 +1300)]
Remove paste config for non-existant cache filters

This appears to be junk DNA from glance, which has filters
for caching image files.

Change-Id: Id7ae29028d351dd005a61a5727bc7d40ceb0a705

12 years agoRemove unused and deprecated auth-context filter
Steve Baker [Fri, 5 Apr 2013 02:47:11 +0000 (15:47 +1300)]
Remove unused and deprecated auth-context filter

keystone.middleware.auth_token is now just aliased to
keystoneclient.middleware.auth_token.

Also heat_auth_token doesn't seem to exist, so this has likely
always been broken

Change-Id: I5eadd9a02e41921b39fc8b6783c22010893bb5e9

12 years agoAttempt to delete resources even if they failed
Zane Bitter [Mon, 8 Apr 2013 10:43:35 +0000 (12:43 +0200)]
Attempt to delete resources even if they failed

To do otherwise risks leaving resources silently running that exist but
have experienced some kind of error during creation.

Fixes bug 1165023

Change-Id: Ie60fb053b1a596d102ca1b6a8429dd50ed41ff92

12 years agoFix AccessKey deletion with bad credentials
Zane Bitter [Mon, 8 Apr 2013 10:43:35 +0000 (12:43 +0200)]
Fix AccessKey deletion with bad credentials

If an AccessKey could not be created, it also could not be deleted. This
change allows deletion of the resource to proceed even if the user does not
exist.

Fixes bug 1155824

Also fixes a bug that the actual key would never be deleted, because the
resource_id is set to None beforehand.

Change-Id: I34886410e3e25ad62e4eba537063f922b011e25a

12 years agoMerge "ReST API: Translate the documentation to WADL"
Jenkins [Mon, 8 Apr 2013 09:43:34 +0000 (09:43 +0000)]
Merge "ReST API: Translate the documentation to WADL"

12 years agoMerge "Delete unused ContextMiddleware"
Jenkins [Fri, 5 Apr 2013 07:32:08 +0000 (07:32 +0000)]
Merge "Delete unused ContextMiddleware"

12 years agoDelete unused ContextMiddleware
Steve Baker [Fri, 5 Apr 2013 00:41:03 +0000 (13:41 +1300)]
Delete unused ContextMiddleware

heat.common.context.ContextMiddleware appears to be the only
one that matters

Change-Id: If4166fa75f7179251b132ac6082b7f29d94b6e97

12 years agoReplace deprecated commands with current equivalents
Steve Baker [Thu, 4 Apr 2013 22:35:28 +0000 (11:35 +1300)]
Replace deprecated commands with current equivalents

Change-Id: I871d7f0e5cd0a22a284a6e6733607feafbbb52a2

12 years agoFix sphinx warnings
Steve Baker [Thu, 4 Apr 2013 22:30:59 +0000 (11:30 +1300)]
Fix sphinx warnings

Change-Id: I0e2e837d7114bde22a5a4b2ffb65aa06416c0a97

12 years agoReST API: Translate the documentation to WADL
Zane Bitter [Thu, 4 Apr 2013 17:25:24 +0000 (19:25 +0200)]
ReST API: Translate the documentation to WADL

Change-Id: Ib1847ee2266d188f198fdf8fb7feb53770d9c1a5

12 years agoMerge "Add Getting Started Guides the developer doc's"
Jenkins [Thu, 4 Apr 2013 15:15:38 +0000 (15:15 +0000)]
Merge "Add Getting Started Guides the developer doc's"

12 years agoMerge "No longer pass no_cache=True to novaclient create"
Jenkins [Thu, 4 Apr 2013 15:09:49 +0000 (15:09 +0000)]
Merge "No longer pass no_cache=True to novaclient create"

12 years agoMerge "Pass in endpoint url for quantum auth_token auth"
Jenkins [Thu, 4 Apr 2013 15:07:58 +0000 (15:07 +0000)]
Merge "Pass in endpoint url for quantum auth_token auth"

12 years agoMerge "Allow nova operations with only auth_token"
Jenkins [Thu, 4 Apr 2013 15:07:56 +0000 (15:07 +0000)]
Merge "Allow nova operations with only auth_token"

12 years agoMerge "Pass in endpoint url for swift auth_token auth"
Jenkins [Thu, 4 Apr 2013 15:06:26 +0000 (15:06 +0000)]
Merge "Pass in endpoint url for swift auth_token auth"

12 years agoMerge "Allow cinder operations with only auth_token"
Jenkins [Thu, 4 Apr 2013 15:06:23 +0000 (15:06 +0000)]
Merge "Allow cinder operations with only auth_token"

12 years agoMerge "Log tracepath for stack validate exceptions."
Jenkins [Thu, 4 Apr 2013 07:29:41 +0000 (07:29 +0000)]
Merge "Log tracepath for stack validate exceptions."

12 years agoAdd Getting Started Guides the developer doc's
Angus Salkeld [Thu, 4 Apr 2013 04:28:04 +0000 (15:28 +1100)]
Add Getting Started Guides the developer doc's

These have been copied from the wiki.

DocImpact
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Change-Id: I4c93bc5a1811e674cef3c7868e7cf9a457c12dea

12 years agoNo longer pass no_cache=True to novaclient create
Steve Baker [Tue, 2 Apr 2013 02:09:29 +0000 (15:09 +1300)]
No longer pass no_cache=True to novaclient create

The default is now os_cache=False, so default behaviour will not
use a keyring that prompts for a password.

This was committed on 2012-12-12 and released in
python-novaclient 2.11.0 on 2013-02-11

Part of blueprint auth-token-only

Change-Id: Id2846b2e344f8e3321240795aebf9a59ddad711a

12 years agoLog tracepath for stack validate exceptions.
Steve Baker [Tue, 2 Apr 2013 23:41:13 +0000 (12:41 +1300)]
Log tracepath for stack validate exceptions.

Calling validate on each resource exercises a lot of code, and
will at times cause non-validation related exceptions.

This change just logs the tracepath for any exception that happens
during validate.

This may be a contender for backporting to milestone-proposed,
since diagnosing some problems on the grizzly branch will be
difficult without it

Change-Id: Ib010a8ec826552e2817da3a22c633dcac6c3ffc6
Fixes: bug #1163586
12 years agoPass in endpoint url for quantum auth_token auth
Steve Baker [Tue, 2 Apr 2013 02:57:19 +0000 (15:57 +1300)]
Pass in endpoint url for quantum auth_token auth

This aligns quantum auth_token only authentication with the
way Horizon does it.

Tested by launching a stack with and without the --token-only flag

Also tested using Horizon, which is auth_token only

Part of blueprint auth-token-only

Change-Id: Ic6d471de527951415ef4858cbbff27cf60561924

12 years agoAllow nova operations with only auth_token
Steve Baker [Tue, 2 Apr 2013 01:57:51 +0000 (14:57 +1300)]
Allow nova operations with only auth_token

This uses the same technique as Horizon for auth_token operations.

Specifically, the nova endpoint is found directly from keystone
and the auth_token and management_url are set on novaclient
after it has been created.

Note that the explicit call to authenticate() is not required
and actually breaks the auth_token case.

Tested by launching a stack with and without the --token-only flag

Also tested using Horizon, which is auth_token only

Part of blueprint auth-token-only

Change-Id: Ic11a838b96a4b5130cb2ac9d685e8a97c9d0a0ad

12 years agoPass in endpoint url for swift auth_token auth
Steve Baker [Tue, 2 Apr 2013 01:13:18 +0000 (14:13 +1300)]
Pass in endpoint url for swift auth_token auth

This aligns swift auth_token only authentication with the
way Horizon does it, and avoids python-swiftclient bug #1160172

Tested by launching a stack with and without the --token-only flag

Also tested using Horizon, which is auth_token only

Part of blueprint auth-token-only

Change-Id: I0622f76e93df4f7353fc0cc61dc962b6c8f0be11

12 years agoAllow cinder operations with only auth_token
Steve Baker [Wed, 27 Mar 2013 20:29:38 +0000 (09:29 +1300)]
Allow cinder operations with only auth_token

This uses the same technique as Horizon for auth_token operations.

Specifically, the cinder endpoint is found directly from keystone
and the auth_token and management_url are set on cinderclient
after it has been created.

Client libs are in theory capable of looking up their own endpoints
given an auth_token, but in practice this is the code-path least
travelled and there are many issues. I think it is best to do what
Horizon does, since all Horizon operations use only a token and always
provide the endpoint to the client lib.

Tested by launching a stack with and without the --token-only flag

Also tested using Horizon, which is auth_token only

Part of blueprint auth-token-only

Change-Id: Iea9159299ad3f354bcc768c9ac1172d6d9f814a8

12 years agoCatch NotFound exceptions on Volume handle_delete
Steve Baker [Tue, 2 Apr 2013 00:24:09 +0000 (13:24 +1300)]
Catch NotFound exceptions on Volume handle_delete

Currently stack delete fails if the underlying volume is
already deleted.
Fixes: bug #1163067
Change-Id: I9d7c009f70a0bb7274f3e19cbe10e9061c5e2d60

12 years agoMerge "Fix swift client token authentication"
Jenkins [Mon, 1 Apr 2013 18:10:49 +0000 (18:10 +0000)]
Merge "Fix swift client token authentication"

12 years agoMerge "Make swift FnGetAtt fault tolerant and block less"
Jenkins [Thu, 28 Mar 2013 09:31:45 +0000 (09:31 +0000)]
Merge "Make swift FnGetAtt fault tolerant and block less"

12 years agoMerge "Don't assume a Parameter value is a str"
Jenkins [Thu, 28 Mar 2013 09:30:20 +0000 (09:30 +0000)]
Merge "Don't assume a Parameter value is a str"

12 years agoheat engine : Autoscaling reload Loadbalancer correctly
Steven Hardy [Wed, 27 Mar 2013 16:08:41 +0000 (16:08 +0000)]
heat engine : Autoscaling reload Loadbalancer correctly

Since the change implemented as part of bug #1136148 we no longer
wait for nova to create the instance before reloading the loadbalancer
which means we race nova assigning an IP to the instance and typically
the loadbalancer config ends up with the 0.0.0.0 default value
which the loadbalancer implementation uses when nova returns no IP.

This patch moves the LB reload into a separate function, which is called
after instances are active on group creation or adjustment

Since our loadbalancer is broken without this fix, this is a candidate
for backporting to grizzly milestone-proposed.

fixes bug #1160407

Change-Id: I50423883dead9a615aa79b8765d5480a9345686d

12 years agoDon't assume a Parameter value is a str
Steve Baker [Wed, 27 Mar 2013 00:35:54 +0000 (13:35 +1300)]
Don't assume a Parameter value is a str

Currently show_stack and list_stacks will fail for templates
which have a Number in the Parameters.

This should be considered for backport to milestone_proposed.

Change-Id: I1b20babf0998f7714f8bc7bf144e03ff1d7c0c91
Fixes: bug #1160653
12 years agoMake swift FnGetAtt fault tolerant and block less
Steve Baker [Tue, 26 Mar 2013 21:02:31 +0000 (10:02 +1300)]
Make swift FnGetAtt fault tolerant and block less

head_container is now only called for required attributes
and will tolerate failure if there is an issue with the underlying
container.

This was preventing deleting of stacks with swift resources.

Possibly this is eligible for backporting to milestone-proposed.

Change-Id: I2f489126957f11924943955a7f63a2ebc45f1911
Fixes: bug #1160584
12 years agoheat : remove fallback ec2signer implementation
Steven Hardy [Tue, 26 Mar 2013 09:44:10 +0000 (09:44 +0000)]
heat : remove fallback ec2signer implementation

Now keystoneclient 0.2.3 has been released, we can remove the
temporary internal ec2signer implementation

Change-Id: I9f050b8771400384615f1ae7f3da76da501e5197

12 years agoFix swift client token authentication
Steve Baker [Tue, 26 Mar 2013 04:11:47 +0000 (17:11 +1300)]
Fix swift client token authentication

Triggered by launching a stack containing swift containers
through Horizon.

The swift client does its own endpoint lookup if we don't know
it, so we don't have to do it ourselves. Also, our endpoint lookup
was broken in the auth_token codepath.

Part of blueprint auth-token-only

Change-Id: I1876f233001a58cb17e7dd7d5cf8883e295a9b87

12 years agovalidate_template returns whole Parameters snippet
Steve Baker [Wed, 20 Mar 2013 03:52:49 +0000 (16:52 +1300)]
validate_template returns whole Parameters snippet

Currently the engine validate_template returns cfn formatted
Parameters from the template, which isn't actually very useful
to build a full UI from a validate call.

This change returns the original Parameters template snippet
and changes the cfn api to reformat to the CFN API legacy format.

The Parameters section of the RPC and the REST APIs now return
a dictionary containing the parameters as specified in the template.
Previously the Parameters section contained a list in the CFN API
format.

Pseudo parameters are filtered out of the validate results.

Change-Id: Iea53dc847ff13f5f479ec3a66bcf141c4ccaeb25
Fixes: bug #1157537
12 years agoheat getting started : fix heat-jeos URL
Steven Hardy [Thu, 21 Mar 2013 17:45:43 +0000 (17:45 +0000)]
heat getting started : fix heat-jeos URL

heat-jeos URL is wrong since heat-api org got deleted

Change-Id: Ic1a89117e9928931fdc07f8fe2934a9d965e3c1e

12 years agoMerge "Get rid of versioninfo cruft"
Jenkins [Thu, 21 Mar 2013 02:09:27 +0000 (02:09 +0000)]
Merge "Get rid of versioninfo cruft"

12 years agoMerge "Tolerate missing keys in reformat_dict_keys"
Jenkins [Thu, 21 Mar 2013 00:04:51 +0000 (00:04 +0000)]
Merge "Tolerate missing keys in reformat_dict_keys"

12 years agoChange executable file permission for rpmlint
Jeff Peeler [Wed, 20 Mar 2013 23:13:16 +0000 (19:13 -0400)]
Change executable file permission for rpmlint

(sync.py)

Change-Id: I335510e6ef2788389248de90c05191c84440ff78
Fixes: Bug #1158009
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoChange executable file permissions for rpmlint
Jeff Peeler [Wed, 20 Mar 2013 22:53:31 +0000 (18:53 -0400)]
Change executable file permissions for rpmlint

Fixes: Bug #1158009
Change-Id: I761debfb77be5cf5204af90a013d7f4f043fdb17
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoTolerate missing keys in reformat_dict_keys
Steve Baker [Wed, 20 Mar 2013 21:42:28 +0000 (10:42 +1300)]
Tolerate missing keys in reformat_dict_keys

For validate, some keys are optional but still need mapping
if they are there.

Helps bug #1157537

Change-Id: Ib29cd99979a84892a98117c607651ea4c352e3d1

12 years agoGet rid of versioninfo cruft
Jeff Peeler [Wed, 20 Mar 2013 18:08:28 +0000 (14:08 -0400)]
Get rid of versioninfo cruft

The version information is no longer stored in a file.

Fixes: Bug #1157885
Change-Id: Ide0662ad3d7b2596743cd9427bc3b50e8357ffe1
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoBump Heat version to 2013.2
Steven Dake [Tue, 19 Mar 2013 21:54:35 +0000 (14:54 -0700)]
Bump Heat version to 2013.2

Heat PTL Signoff for 2013.1

Change-Id: Ic8d91e1629642bbb54f673c1e879898d66e010bc

12 years agoMerge "Create a wsgi factory method for Debug filter."
Jenkins [Mon, 18 Mar 2013 02:40:36 +0000 (02:40 +0000)]
Merge "Create a wsgi factory method for Debug filter."

12 years agoMerge "If a stack create fails, ensure the stack is deleteable"
Jenkins [Sun, 17 Mar 2013 23:32:28 +0000 (23:32 +0000)]
Merge "If a stack create fails, ensure the stack is deleteable"

12 years agoMerge "Add heat-keystone-setup man page"
Jenkins [Sun, 17 Mar 2013 21:04:42 +0000 (21:04 +0000)]
Merge "Add heat-keystone-setup man page"

12 years agoCreate a wsgi factory method for Debug filter.
Steve Baker [Sun, 17 Mar 2013 20:21:35 +0000 (09:21 +1300)]
Create a wsgi factory method for Debug filter.

This can be enabled by putting the following in the *-paste.ini
file:
[filter:debug]
paste.filter_factory = heat.common.wsgi:filter_factory
heat.filter_factory = heat.common.wsgi:debug_filter

and adding 'debug' to the pipeline.

This assisted with bug #1133792

Change-Id: I4c2d3194ac9673d095b4115d4b6f385fd2f4fa4e

12 years agoIf a stack create fails, ensure the stack is deleteable
Steven Dake [Sat, 16 Mar 2013 20:37:29 +0000 (13:37 -0700)]
If a stack create fails, ensure the stack is deleteable

The resource delete operation attempts to delete CREATE_FAILED
resources.  Further it attempts to delete resources that were
not created during a creation operation because further processing
of the template does not take place.

This patch special cases these two conditions in the delete operation.

Change-Id: I1c83ba68754f38a0f7e91e77fcf02177c457504e
Fixes: Bug #1155824
12 years agoMerge "heat docs : Add 2013 to the copyright string"
Jenkins [Fri, 15 Mar 2013 21:43:43 +0000 (21:43 +0000)]
Merge "heat docs : Add 2013 to the copyright string"

12 years agoMerge "Add a manual page for heat-db-setup"
Jenkins [Fri, 15 Mar 2013 18:18:27 +0000 (18:18 +0000)]
Merge "Add a manual page for heat-db-setup"

12 years agoMerge "Use built-in exception filtering for GreenletExit"
Jenkins [Fri, 15 Mar 2013 17:19:18 +0000 (17:19 +0000)]
Merge "Use built-in exception filtering for GreenletExit"

12 years agoAdd a manual page for heat-db-setup
sdake [Thu, 14 Mar 2013 18:31:19 +0000 (11:31 -0700)]
Add a manual page for heat-db-setup

Change-Id: I628d9e1295238b0bc405fc6ccb464889b85090e0
Fixes: Bug #1153691
12 years agoAdd heat-keystone-setup man page
Steven Dake [Thu, 14 Mar 2013 22:03:55 +0000 (15:03 -0700)]
Add heat-keystone-setup man page

Change-Id: I314ce01d35d65e3b50b72d2abaf51710b8461da7
Fixes: Bug #1153693
12 years agoMerge "part-handler: add missing import"
Jenkins [Thu, 14 Mar 2013 22:18:45 +0000 (22:18 +0000)]
Merge "part-handler: add missing import"

12 years agoMerge "loguserdata: handle exceptions from running the userdata"
Jenkins [Thu, 14 Mar 2013 22:18:03 +0000 (22:18 +0000)]
Merge "loguserdata: handle exceptions from running the userdata"

12 years agoMerge "Allow per-deployment configuration of user id"
Jenkins [Thu, 14 Mar 2013 22:14:24 +0000 (22:14 +0000)]
Merge "Allow per-deployment configuration of user id"

12 years agoMerge "Remove ssh from cloud-config-files"
Jenkins [Thu, 14 Mar 2013 22:13:31 +0000 (22:13 +0000)]
Merge "Remove ssh from cloud-config-files"

12 years agoSort the manual page list in conf.py
sdake [Thu, 14 Mar 2013 18:30:34 +0000 (11:30 -0700)]
Sort the manual page list in conf.py

Change-Id: I81c193c23a3b78cb98d54157a486bf15dc3ab979
Fixes: Bug #1153691
12 years agoAllow per-deployment configuration of user id
sdake [Wed, 13 Mar 2013 04:50:58 +0000 (21:50 -0700)]
Allow per-deployment configuration of user id

Previously user ids of new instances were limited to ec2-user.
This patch adds a new configuration option to be placed in
/etc/heat/heat-engine.conf called "default_instance_user" which
allows the default of ec2-user to be overriden.

Note for reviewers that runcmd does not work properly.  It was
actually running after the loguserdata.py script finished execution.

Fixes: Bug #1101347
Change-Id: Ica2dbe63d9dcbce8bb8de298eba452c34ab173d9

12 years agoMerge "loguserdata: prevent shadowing of arguments and globals"
Jenkins [Thu, 14 Mar 2013 15:38:24 +0000 (15:38 +0000)]
Merge "loguserdata: prevent shadowing of arguments and globals"

12 years agoRemove ssh from cloud-config-files
sdake [Thu, 14 Mar 2013 14:38:31 +0000 (07:38 -0700)]
Remove ssh from cloud-config-files

the cc_ssh script already executes in cloud config without being
explicitly called.  As it is now, it is executing twice.

Make it execute only once.

Change-Id: I2d53adbea0175f63db71be516639d40aa0f8a1de

12 years agoMerge "Update dependency versions to match oslo-incubator"
Jenkins [Thu, 14 Mar 2013 11:01:59 +0000 (11:01 +0000)]
Merge "Update dependency versions to match oslo-incubator"

12 years agoMerge "heat engine : fix exception syntax issue"
Jenkins [Thu, 14 Mar 2013 05:45:08 +0000 (05:45 +0000)]
Merge "heat engine : fix exception syntax issue"

12 years agologuserdata: handle exceptions from running the userdata
Angus Salkeld [Thu, 14 Mar 2013 03:21:55 +0000 (14:21 +1100)]
loguserdata: handle exceptions from running the userdata

- log the exceptions so the user can diagnose issues.

bug 1154641
Change-Id: Ic085c9f062255a9fa44b3e31b464c9ebd19a947c
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agologuserdata: prevent shadowing of arguments and globals
Angus Salkeld [Thu, 14 Mar 2013 01:33:23 +0000 (12:33 +1100)]
loguserdata: prevent shadowing of arguments and globals

cleaning this up for bug 1154641

Change-Id: I95271bdeba1bba29e78af79de4e2173d07750e4f
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agopart-handler: add missing import
Angus Salkeld [Thu, 14 Mar 2013 01:25:12 +0000 (12:25 +1100)]
part-handler: add missing import

errno is used in the excption but not imported.

bug 1154887
Change-Id: I1c2961f08824d919ed2483a0a9cf54c50862f354

12 years agoMerge "Remove Nova dependencies from hacking test"
Jenkins [Wed, 13 Mar 2013 22:17:40 +0000 (22:17 +0000)]
Merge "Remove Nova dependencies from hacking test"

12 years agoMerge "heat docs : Add heat-watch manpage"
Jenkins [Wed, 13 Mar 2013 19:15:37 +0000 (19:15 +0000)]
Merge "heat docs : Add heat-watch manpage"

12 years agoheat engine : fix exception syntax issue
Steven Hardy [Wed, 13 Mar 2013 18:03:34 +0000 (18:03 +0000)]
heat engine : fix exception syntax issue

Fix exception clause to use a tuple or the two types of
exception are not correctly caught.

fixes bug 1154708

Change-Id: Ia742c92dc189d03f8034ca864334526f1234dde3

12 years agoheat docs : Add manpage for heat-boto
Steven Hardy [Wed, 13 Mar 2013 14:12:29 +0000 (14:12 +0000)]
heat docs : Add manpage for heat-boto

Fixes bug 1153688

Change-Id: Ie48c7158d253951e5885e8b701cd1c4c9a5fa37e

12 years agoRemove Nova dependencies from hacking test
Zane Bitter [Wed, 13 Mar 2013 11:41:06 +0000 (12:41 +0100)]
Remove Nova dependencies from hacking test

References to Nova in the docstrings(!) of the hacking.py tests caused the
run_pep8.sh script to fail if the Grizzly development version of Nova was
not installed. Update all the references to use Heat packages instead.

Change-Id: I2e84e9a231451705d61fa9acddc65ee95a98e294

12 years agoheat docs : Add 2013 to the copyright string
Steven Hardy [Wed, 13 Mar 2013 11:39:13 +0000 (11:39 +0000)]
heat docs : Add 2013 to the copyright string

Change-Id: I0c86ccfd7232396d1fc6883b37adc2d5b877d19c

12 years agoheat docs : Add heat-watch manpage
Steven Hardy [Wed, 13 Mar 2013 11:37:59 +0000 (11:37 +0000)]
heat docs : Add heat-watch manpage

fixes bug 1153689

Change-Id: I7a4566cb850cf94761c1948fa7ad976e7d4f5446

12 years agoUpdate dependency versions to match oslo-incubator
Zane Bitter [Wed, 13 Mar 2013 08:28:14 +0000 (09:28 +0100)]
Update dependency versions to match oslo-incubator

Fixes bug 1097843

Change-Id: I3bd56261ed9e3640adb07965d4394d99db45e0b5

12 years agoFix security groups (need to be accessed as attributes)
Angus Salkeld [Wed, 13 Mar 2013 06:16:20 +0000 (17:16 +1100)]
Fix security groups (need to be accessed as attributes)

bug 1134193
Thanks Lukas Barton for the patch in the bug.

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

12 years agoMerge "Remove todolist from docs index"
Jenkins [Wed, 13 Mar 2013 00:39:21 +0000 (00:39 +0000)]
Merge "Remove todolist from docs index"

12 years agoRemove todolist from docs index
Angus Salkeld [Wed, 13 Mar 2013 00:13:12 +0000 (11:13 +1100)]
Remove todolist from docs index

This does not seem to be supported, so removing.

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

12 years agoOnly split roles if they are not None.
Ian Main [Fri, 1 Mar 2013 04:30:59 +0000 (23:30 -0500)]
Only split roles if they are not None.

Change-Id: I2fbfbd6f6b1c898f7032744f9411821d5d97048c
Signed-off-by: Ian Main <imain@redhat.com>
Fixes: bug #1136891
12 years agoMerge "Revert NestedStack FnGetRefId changes"
Jenkins [Tue, 12 Mar 2013 19:34:32 +0000 (19:34 +0000)]
Merge "Revert NestedStack FnGetRefId changes"

12 years agoMerge "heat engine : Add validation of stack names"
Jenkins [Tue, 12 Mar 2013 18:35:08 +0000 (18:35 +0000)]
Merge "heat engine : Add validation of stack names"

12 years agoMerge "heat templates : Update for F18"
Jenkins [Tue, 12 Mar 2013 18:35:05 +0000 (18:35 +0000)]
Merge "heat templates : Update for F18"

12 years agoRevert NestedStack FnGetRefId changes
Zane Bitter [Tue, 12 Mar 2013 18:29:38 +0000 (19:29 +0100)]
Revert NestedStack FnGetRefId changes

This partially reverts commit e376c83cbd57c0720336848e4b82e3b7b804a347.

Allow StackResource to set the resource_id, since it will be the one
retrieving the stack using it.

Fixes bug #1154202

Change-Id: I2140afb4e9bf89b4eb73e45f4ef5974df98e87e1

12 years agoMerge "Squash Grizzly database migrations"
Jenkins [Tue, 12 Mar 2013 18:29:13 +0000 (18:29 +0000)]
Merge "Squash Grizzly database migrations"

12 years agoMerge "Pin SQLAlchemy to 0.7.x"
Jenkins [Tue, 12 Mar 2013 18:10:22 +0000 (18:10 +0000)]
Merge "Pin SQLAlchemy to 0.7.x"

12 years agoSwitch to final 1.1.0 oslo.config release
Mark McLoughlin [Tue, 12 Mar 2013 16:37:35 +0000 (16:37 +0000)]
Switch to final 1.1.0 oslo.config release

Fixes bug #1128256

oslo.config has now been released to PyPI in time for Grizzly RC1 so
we can switch to using it directly.

Change-Id: I655f831718ae5f4e25e941ee206fe195214a9a91

12 years agoheat templates : Update for F18
Steven Hardy [Tue, 12 Mar 2013 14:39:11 +0000 (14:39 +0000)]
heat templates : Update for F18

Remove F16 as it's EOL, update with F18 as it's the current
version.  Leave the default as F17 for now in all except the
Openshift templates (because Openshift doesn't work on F17,
although these templates are currently broken anyway..)

fixes bug 1154121

Change-Id: Ia95e6bfb4a15e355dfb0051d57f5b70a408551c6

12 years agoheat engine : Add validation of stack names
Steven Hardy [Tue, 12 Mar 2013 09:50:33 +0000 (09:50 +0000)]
heat engine : Add validation of stack names

Add regex validation of stack names, aligns us with stack names
allowed by AWS, with the addition of "." and "_" characters

fixes bug 1103447

Change-Id: I8fab0d3ad03379dfc2a18dc016e66ca8fee6cc86

12 years agoPin SQLAlchemy to 0.7.x
Dirk Mueller [Mon, 11 Mar 2013 15:28:17 +0000 (16:28 +0100)]
Pin SQLAlchemy to 0.7.x

0.7.10 has been released and is compatible with 0.7.x. Instead
of pinning to 0.7.9, simply pin to 0.7.x to avoid SQLAlchemy 0.8

Fixes: Bug #1153983
Change-Id: I1a2ea0c36161df15fd55e95a6679628d14858944

12 years agoSquash Grizzly database migrations
Zane Bitter [Tue, 12 Mar 2013 09:03:29 +0000 (10:03 +0100)]
Squash Grizzly database migrations

Fixes bug #1072949

Change-Id: I07e4d1454141c9011aacdec3a4eb01a3ea1936c9

12 years agoUse internal DB management
Zane Bitter [Tue, 12 Mar 2013 09:03:29 +0000 (10:03 +0100)]
Use internal DB management

Use our own internal code for managing database migrations, rather than
calling sqlalchemy-migrate's command line directly. This allows us to
automatically specify the initial version of the database, which is
required in order to be able to squash migrations (bug 1072949).

Change-Id: I88206f8b55fe6fe4016cee8e5bf1d5eeb0ae30d2

12 years agoMerge "Register DB options independently of engine"
Jenkins [Tue, 12 Mar 2013 02:02:01 +0000 (02:02 +0000)]
Merge "Register DB options independently of engine"

12 years agoMerge "Avoid manipulating DB directly in unit test"
Jenkins [Mon, 11 Mar 2013 20:11:56 +0000 (20:11 +0000)]
Merge "Avoid manipulating DB directly in unit test"