]>
review.fuel-infra Code Review - openstack-build/heat-build.git/log
Jeff Peeler [Fri, 19 Oct 2012 15:20:04 +0000 (11:20 -0400)]
Do not assume host has selinux utils installed
related to #265
Change-Id: I4a6cff1f05b6f4f88d672cc0d4ce5e8f62a58e47
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
Zane Bitter [Fri, 19 Oct 2012 14:15:13 +0000 (16:15 +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>
Jeff Peeler [Thu, 18 Oct 2012 18:53:26 +0000 (14:53 -0400)]
Make default distribution U10 for deb template
Change-Id: Ifcfc7d1fbb6fac2a785a0dc5a4e6ba09cf898ed4
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
Steven Hardy [Wed, 17 Oct 2012 12:37:57 +0000 (13:37 +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>
Zane Bitter [Tue, 16 Oct 2012 14:31:59 +0000 (16:31 +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>
Zane Bitter [Wed, 17 Oct 2012 08:33:45 +0000 (10:33 +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>
Jenkins [Wed, 17 Oct 2012 08:33:13 +0000 (08:33 +0000)]
Merge "heat tests : Remove utils.Stack getter methods"
Steven Hardy [Tue, 16 Oct 2012 16:24:53 +0000 (17:24 +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>
Zane Bitter [Tue, 16 Oct 2012 14:33:55 +0000 (16:33 +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>
Jenkins [Tue, 16 Oct 2012 14:16:50 +0000 (14:16 +0000)]
Merge "heat : heat cli pep cleanups"
Steven Hardy [Tue, 16 Oct 2012 13:16:17 +0000 (14:16 +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>
Steven Hardy [Tue, 16 Oct 2012 12:45:24 +0000 (13:45 +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>
Steven Hardy [Tue, 16 Oct 2012 12:19:27 +0000 (13:19 +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>
Steven Hardy [Tue, 16 Oct 2012 13:34:38 +0000 (14:34 +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>
Steven Hardy [Mon, 8 Oct 2012 12:48:27 +0000 (13:48 +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>
Zane Bitter [Tue, 16 Oct 2012 11:35:23 +0000 (13:35 +0200)]
Catch SSH Disconnection errors in functional tests
Change-Id: I24f959cbaa36138bafeda70a3966000673c80c56
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Steven Hardy [Tue, 16 Oct 2012 09:38:17 +0000 (10:38 +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>
Steven Hardy [Mon, 15 Oct 2012 15:42:52 +0000 (16:42 +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>
Steven Hardy [Mon, 15 Oct 2012 16:01:39 +0000 (17:01 +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>
Zane Bitter [Mon, 15 Oct 2012 14:33:19 +0000 (16:33 +0200)]
Obey the passed in distro value in HAProxy template
Change-Id: I7e1dad654746329763bb575a09611aa0b827ec24
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Zane Bitter [Mon, 15 Oct 2012 14:13:12 +0000 (16:13 +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>
Zane Bitter [Mon, 15 Oct 2012 13:46:49 +0000 (15:46 +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>
Zane Bitter [Fri, 12 Oct 2012 20:32:54 +0000 (22:32 +0200)]
ReST API: Add unit tests
Change-Id: Id815c7d5d08e912f64268529b4bdbdcd06c1c47e
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Steven Hardy [Mon, 15 Oct 2012 10:34:52 +0000 (11:34 +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>
Zane Bitter [Mon, 15 Oct 2012 09:57:11 +0000 (11:57 +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>
Jenkins [Mon, 15 Oct 2012 08:57:10 +0000 (08:57 +0000)]
Merge "heat : Remove cloudwatch functionalty from metadata server"
Jenkins [Mon, 15 Oct 2012 08:55:04 +0000 (08:55 +0000)]
Merge "heat templates : Add boto config to HA templates"
Jenkins [Mon, 15 Oct 2012 08:43:19 +0000 (08:43 +0000)]
Merge "heat engine : Move watch logic into WatchRule class"
Steven Hardy [Fri, 28 Sep 2012 07:02:20 +0000 (08:02 +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>
Zane Bitter [Fri, 12 Oct 2012 20:32:54 +0000 (22:32 +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>
Zane Bitter [Fri, 12 Oct 2012 20:32:54 +0000 (22:32 +0200)]
ReST API: Return appropriate error codes
Change-Id: I769366dd164199c3b7d16ca8bf4c4d99d21dbb7b
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Zane Bitter [Fri, 12 Oct 2012 20:32:54 +0000 (22:32 +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>
Steven Hardy [Fri, 12 Oct 2012 16:18:11 +0000 (17:18 +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>
Steven Hardy [Fri, 12 Oct 2012 09:49:13 +0000 (10:49 +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
Steven Hardy [Fri, 12 Oct 2012 12:45:11 +0000 (13:45 +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
Steven Hardy [Wed, 10 Oct 2012 09:03:11 +0000 (10:03 +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
Jenkins [Wed, 10 Oct 2012 22:17:18 +0000 (22:17 +0000)]
Merge "ReST API: Add some simple API documentation"
Jenkins [Wed, 10 Oct 2012 22:16:56 +0000 (22:16 +0000)]
Merge "ReST API: Use JSON documents for data input"
Jenkins [Wed, 10 Oct 2012 22:14:02 +0000 (22:14 +0000)]
Merge "ReST API: Refactor handling of input data"
Steve Baker [Wed, 10 Oct 2012 19:18:04 +0000 (08:18 +1300)]
Unit test for load balancer resource type.
Change-Id: I2386419563f02bcb509a8547fd587b9af6285c5c
Jenkins [Wed, 10 Oct 2012 18:17:25 +0000 (18:17 +0000)]
Merge "heat : Add missing calculate_properties to user resource"
Jenkins [Wed, 10 Oct 2012 18:15:07 +0000 (18:15 +0000)]
Merge "heat engine : Avoid printing credentials to logfile"
Steven Hardy [Wed, 10 Oct 2012 17:20:25 +0000 (18:20 +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>
Steven Hardy [Mon, 8 Oct 2012 16:16:42 +0000 (17:16 +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>
Steven Hardy [Wed, 10 Oct 2012 17:51:20 +0000 (18:51 +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>
Zane Bitter [Wed, 10 Oct 2012 16:22:01 +0000 (18:22 +0200)]
ReST API: Add some simple API documentation
Change-Id: I6b3ff5a46e0ba836634cc21cf7ee8945a18a6a3a
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Zane Bitter [Tue, 9 Oct 2012 15:55:37 +0000 (17:55 +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>
Zane Bitter [Wed, 10 Oct 2012 13:38:04 +0000 (15:38 +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>
Zane Bitter [Wed, 10 Oct 2012 13:38:04 +0000 (15:38 +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>
Steven Hardy [Wed, 10 Oct 2012 10:57:33 +0000 (11:57 +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>
Steve Baker [Wed, 10 Oct 2012 00:21:47 +0000 (13:21 +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.
Jenkins [Tue, 9 Oct 2012 16:19:50 +0000 (16:19 +0000)]
Merge "Remove unnecessary keystone scripts"
Jeff Peeler [Sat, 29 Sep 2012 00:00:34 +0000 (20:00 -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>
Jeff Peeler [Sat, 29 Sep 2012 00:08:35 +0000 (20:08 -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>
Zane Bitter [Tue, 9 Oct 2012 08:37:01 +0000 (10:37 +0200)]
Fix bugs in ReST API stack creation
Change-Id: I39277224305465cc951e397f340012563c0f7174
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Zane Bitter [Tue, 9 Oct 2012 10:06:44 +0000 (12:06 +0200)]
Allow authentication to Nova with a Keystone token
Change-Id: I3ca90169559cc167ff51db5fe47ceec8c917f04b
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Jenkins [Mon, 8 Oct 2012 19:42:08 +0000 (19:42 +0000)]
Merge "Make sure to remove python-glanceclient too"
Jenkins [Mon, 8 Oct 2012 19:09:37 +0000 (19:09 +0000)]
Merge "Fix hash-bang directive in nova_create_flavors.sh"
Jenkins [Mon, 8 Oct 2012 16:02:04 +0000 (16:02 +0000)]
Merge "heat tests : add functional test for UpdateStack"
Jenkins [Mon, 8 Oct 2012 15:57:25 +0000 (15:57 +0000)]
Merge "heat tests : functional utils support for UpdateStack"
Jenkins [Mon, 8 Oct 2012 15:56:55 +0000 (15:56 +0000)]
Merge "heat tests : Add new boto API test"
Steven Hardy [Mon, 8 Oct 2012 15:21:25 +0000 (16:21 +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>
Eoghan Glynn [Mon, 8 Oct 2012 14:20:37 +0000 (15:20 +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
Eoghan Glynn [Mon, 8 Oct 2012 11:51:17 +0000 (12:51 +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
Steve Baker [Fri, 5 Oct 2012 09:07:53 +0000 (10:07 +0100)]
import gettext to fix db migration execution
Jeff Peeler [Sat, 29 Sep 2012 00:04:16 +0000 (20:04 -0400)]
Make sure to remove python-glanceclient too
Change-Id: I44c39824f5b1d96ac69e6972506fc865718b3c59
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
Steven Hardy [Thu, 27 Sep 2012 13:12:59 +0000 (14:12 +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>
Steven Hardy [Wed, 26 Sep 2012 13:37:07 +0000 (14:37 +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>
Steven Hardy [Mon, 24 Sep 2012 16:41:23 +0000 (17:41 +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>
Jenkins [Fri, 28 Sep 2012 01:42:09 +0000 (01:42 +0000)]
Merge "Add the beginnings of an OpenStack ReST API"
Jenkins [Fri, 28 Sep 2012 01:32:49 +0000 (01:32 +0000)]
Merge "Unit test for DBInstance resource."
Jenkins [Fri, 28 Sep 2012 01:30:34 +0000 (01:30 +0000)]
Merge "heat tests : API test fixup for ResourceProperties"
Zane Bitter [Tue, 25 Sep 2012 14:13:35 +0000 (16:13 +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>
Steven Hardy [Thu, 27 Sep 2012 14:00:50 +0000 (15:00 +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>
Zane Bitter [Thu, 27 Sep 2012 12:40:52 +0000 (14:40 +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>
Steven Hardy [Thu, 27 Sep 2012 13:43:34 +0000 (14:43 +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>
Zane Bitter [Thu, 27 Sep 2012 12:57:50 +0000 (14:57 +0200)]
Move CloudFormation API to heat.api.cfn package
Change-Id: Ib0adf6f38da298b0b87d80272904767066b41087
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Zane Bitter [Thu, 27 Sep 2012 09:49:07 +0000 (11:49 +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>
Steve Baker [Wed, 26 Sep 2012 03:53:03 +0000 (15:53 +1200)]
Unit test for DBInstance resource.
Coverage is 100% assuming you don't count the
nested template as code.
Change-Id: I846ed736d75eeef8723c33db7cae889a26049d9a
Steven Dake [Wed, 26 Sep 2012 17:08:05 +0000 (10:08 -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>
Steven Hardy [Wed, 26 Sep 2012 15:21:33 +0000 (16:21 +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>
Steven Hardy [Wed, 26 Sep 2012 13:51:08 +0000 (14:51 +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>
Steve Baker [Mon, 24 Sep 2012 23:46:08 +0000 (11:46 +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
Jenkins [Mon, 24 Sep 2012 14:57:28 +0000 (14:57 +0000)]
Merge "Rename heat/cloudformations.py to heat/cloudformation.py"
Steven Dake [Mon, 24 Sep 2012 04:34:20 +0000 (21:34 -0700)]
Rename heat/cloudformations.py to heat/cloudformation.py
Change-Id: I1db2e5b191b35a07aa51113829d95085bfbfc8e7
Signed-off-by: Steven Dake <sdake@redhat.com>
Steve Baker [Tue, 18 Sep 2012 02:31:57 +0000 (14:31 +1200)]
Trivial unit test changes
- rename assertEquals to assertEqual
- fix the swiftclient package import, which was broken
for testing
Change-Id: Icbe80ded918b9b2d089797645bf8d46a9efaf619
Steve Baker [Mon, 24 Sep 2012 03:26:56 +0000 (15:26 +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
Steve Baker [Sun, 23 Sep 2012 21:08:20 +0000 (09:08 +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
Jenkins [Sun, 23 Sep 2012 22:24:47 +0000 (22:24 +0000)]
Merge "Get rid of gratuitous params in RPC API"
Jenkins [Sun, 23 Sep 2012 22:17:15 +0000 (22:17 +0000)]
Merge "Stop deprecation warning when creating resources directly."
Zane Bitter [Fri, 21 Sep 2012 15:12:46 +0000 (17:12 +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>
Steve Baker [Fri, 21 Sep 2012 03:18:36 +0000 (15:18 +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
Jeff Peeler [Thu, 20 Sep 2012 21:11:47 +0000 (17:11 -0400)]
Change file to executable to get rid of rpmlint warning
Change-Id: I5274c04bca9c5f089c39a241cc2ba4ea96e279ac
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
Jeff Peeler [Thu, 20 Sep 2012 18:15:49 +0000 (14:15 -0400)]
Version 6 about to be announced for release, time for v7
Change-Id: Ie85008bc7acce7535268fec0a62a0fda7bbbd1ec
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
Steven Hardy [Thu, 20 Sep 2012 17:10:29 +0000 (18:10 +0100)]
heat : HA functional test missing import
Change-Id: Ife9b85c321b41f9d838bf413734a803f858d93c8
Signed-off-by: Steven Hardy <shardy@redhat.com>
Steven Hardy [Thu, 20 Sep 2012 16:59:11 +0000 (17:59 +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>
Steven Hardy [Thu, 20 Sep 2012 15:02:27 +0000 (16:02 +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>
Steven Hardy [Thu, 20 Sep 2012 13:37:41 +0000 (14:37 +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>
Zane Bitter [Thu, 20 Sep 2012 09:14:53 +0000 (11:14 +0200)]
Don't fail to delete if VolumeAttachment not found
Change-Id: If12b7ebbee2d71e39e49152d971c11f55badca18
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Zane Bitter [Thu, 20 Sep 2012 09:14:53 +0000 (11:14 +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>