]>
review.fuel-infra Code Review - openstack-build/heat-build.git/log
Zane Bitter [Wed, 11 Jul 2012 14:37:47 +0000 (10:37 -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>
Zane Bitter [Mon, 9 Jul 2012 18:23:31 +0000 (14:23 -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>
Zane Bitter [Fri, 6 Jul 2012 18:40:00 +0000 (20:40 +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>
Zane Bitter [Wed, 11 Jul 2012 13:53:40 +0000 (09:53 -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>
Jenkins [Wed, 11 Jul 2012 12:31:53 +0000 (12:31 +0000)]
Merge "Add DB refresh/expire on specific parameters"
Jenkins [Wed, 11 Jul 2012 12:27:04 +0000 (12:27 +0000)]
Merge "Allow Status(Reason) access through Stack/Resource objects"
Steven Hardy [Tue, 10 Jul 2012 12:56:41 +0000 (13:56 +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>
Steven Hardy [Mon, 9 Jul 2012 16:54:59 +0000 (17:54 +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>
Steven Hardy [Mon, 9 Jul 2012 13:58:08 +0000 (14:58 +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>
Zane Bitter [Fri, 6 Jul 2012 15:13:09 +0000 (17:13 +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>
Zane Bitter [Fri, 6 Jul 2012 15:03:17 +0000 (17:03 +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>
Zane Bitter [Fri, 6 Jul 2012 15:03:17 +0000 (17:03 +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>
Steven Hardy [Thu, 5 Jul 2012 20:53:36 +0000 (21:53 +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>
Steven Hardy [Thu, 5 Jul 2012 20:51:55 +0000 (21:51 +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
Zane Bitter [Fri, 6 Jul 2012 12:33:19 +0000 (14:33 +0200)]
Separate out formatting for Engine API from manager
Change-Id: Ib5fc28bc6a3a2f1f3c0d291954e928d4fb036bbb
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Zane Bitter [Fri, 6 Jul 2012 13:07:46 +0000 (15:07 +0200)]
Add new assertions about event unit tests
Change-Id: I5a7d4690fe752c053a08ecfdb4f0467026fdd245
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Angus Salkeld [Fri, 6 Jul 2012 06:57:48 +0000 (16:57 +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>
Angus Salkeld [Fri, 6 Jul 2012 08:10:57 +0000 (18:10 +1000)]
Add NovaSchedulerHints and correct the implementation of Tags
Change-Id: Iaa7ea182414a8fc48a78f5aa6c2c3e1baddb4034
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Steven Hardy [Thu, 5 Jul 2012 15:58:19 +0000 (16:58 +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>
Steven Hardy [Thu, 5 Jul 2012 15:57:20 +0000 (16:57 +0100)]
heat tools : openstack script add restart option
Add option to restart openstack
Change-Id: I7578ff4cecae5351d5749272424d71b56071239d
Signed-off-by: Steven Hardy <shardy@redhat.com>
Steven Hardy [Thu, 5 Jul 2012 15:39:57 +0000 (16:39 +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>
Steven Hardy [Thu, 5 Jul 2012 13:42:53 +0000 (14:42 +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>
Steven Hardy [Thu, 5 Jul 2012 13:15:37 +0000 (14:15 +0100)]
heat API : cleanup docstrings
Fix some API docstring formatting & content
Change-Id: Iad1646bb91ae501110ee20a5820ffc5c168bcc45
Signed-off-by: Steven Hardy <shardy@redhat.com>
Jenkins [Thu, 5 Jul 2012 16:53:06 +0000 (16:53 +0000)]
Merge "Add more unit tests for the engine API"
Jenkins [Thu, 5 Jul 2012 14:18:35 +0000 (14:18 +0000)]
Merge "Pass Tags into scheduler_hints"
Angus Salkeld [Thu, 5 Jul 2012 13:44:05 +0000 (23:44 +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>
Jenkins [Thu, 5 Jul 2012 13:17:35 +0000 (13:17 +0000)]
Merge "heat tools : heat-db-drop prompt for missing password"
Angus Salkeld [Thu, 5 Jul 2012 05:42:08 +0000 (15:42 +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>
Angus Salkeld [Thu, 5 Jul 2012 11:18:26 +0000 (21:18 +1000)]
Pass Tags into scheduler_hints
Change-Id: Idad6090c7baf0db943c999585dfe3bf33fc9492e
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Steven Hardy [Thu, 5 Jul 2012 09:46:53 +0000 (10:46 +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>
Steven Hardy [Wed, 4 Jul 2012 14:41:20 +0000 (15:41 +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>
Steven Hardy [Wed, 4 Jul 2012 10:45:38 +0000 (11:45 +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>
Steven Hardy [Fri, 29 Jun 2012 13:11:14 +0000 (14:11 +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>
Zane Bitter [Wed, 4 Jul 2012 14:16:16 +0000 (16:16 +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>
Zane Bitter [Tue, 3 Jul 2012 15:11:12 +0000 (17:11 +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>
Zane Bitter [Tue, 3 Jul 2012 13:04:39 +0000 (15:04 +0200)]
Add Metadata to detailed Resource output
Change-Id: I492b9a0a190a905ca5c8597c7236ad1d130a5b77
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Zane Bitter [Tue, 3 Jul 2012 12:55:30 +0000 (14:55 +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>
Zane Bitter [Tue, 3 Jul 2012 11:02:03 +0000 (13:02 +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>
Zane Bitter [Tue, 3 Jul 2012 10:41:40 +0000 (12:41 +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>
Zane Bitter [Tue, 3 Jul 2012 10:32:02 +0000 (12:32 +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>
Zane Bitter [Tue, 3 Jul 2012 12:03:47 +0000 (14:03 +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>
Zane Bitter [Tue, 3 Jul 2012 16:56:22 +0000 (18:56 +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>
Zane Bitter [Tue, 3 Jul 2012 09:25:33 +0000 (11:25 +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>
Andrew Hutchings [Wed, 4 Jul 2012 12:27:45 +0000 (13:27 +0100)]
Switch .gitreview to use OpenStack
Change-Id: I47f98c5b68bffb0f547a1ca95e745dd2c4665dad
Angus Salkeld [Tue, 3 Jul 2012 04:55:56 +0000 (14:55 +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>
Angus Salkeld [Mon, 2 Jul 2012 03:10:59 +0000 (13:10 +1000)]
Add the Fn::GetAZs() intrinsic function.
This just returns 'nova' right now.
Change-Id: I5449123b912da0f2aaca8a16aee78d391db033dd
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Angus Salkeld [Mon, 2 Jul 2012 01:23:32 +0000 (11:23 +1000)]
Teach CheckedSchema to do nested schemas
Change-Id: Ie321fcded8c826ca98c15078d9a545f283d25510
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Jenkins [Mon, 2 Jul 2012 18:16:21 +0000 (18:16 +0000)]
Merge "Bump to v5"
Steven Hardy [Mon, 2 Jul 2012 13:04:33 +0000 (14:04 +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>
Steven Hardy [Fri, 29 Jun 2012 12:08:47 +0000 (13:08 +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>
Zane Bitter [Fri, 29 Jun 2012 08:52:41 +0000 (10:52 +0200)]
Add unit tests for timeout extraction
Change-Id: I87837b78dc04683aa686f0573bb7b643667c4553
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Steven Hardy [Mon, 25 Jun 2012 15:38:51 +0000 (16:38 +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>
Zane Bitter [Fri, 29 Jun 2012 08:22:21 +0000 (10:22 +0200)]
Fix typo in stack creation code
Broken by
b942be0e362ef6c04afb45f0ecae8fa4ce432a20
Change-Id: Iad6ace2d460212a41b8504d479335b9f16b5d5ce
Signed-off-by: Zane Bitter <zbitter@redhat.com>
Jeff Peeler [Thu, 28 Jun 2012 03:35:32 +0000 (23:35 -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>
Jenkins [Thu, 28 Jun 2012 22:00:45 +0000 (22:00 +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()
Steven Hardy [Mon, 25 Jun 2012 16:42:15 +0000 (17:42 +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>
Steven Dake [Thu, 28 Jun 2012 20:01:12 +0000 (13:01 -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>
Steven Dake [Thu, 28 Jun 2012 18:36:50 +0000 (11:36 -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>
Zane Bitter [Wed, 27 Jun 2012 09:47:30 +0000 (11:47 +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>
Zane Bitter [Tue, 26 Jun 2012 09:36:10 +0000 (11:36 +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>
Zane Bitter [Mon, 25 Jun 2012 13:03:17 +0000 (15:03 +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>
Ian Main [Wed, 27 Jun 2012 16:56:54 +0000 (09:56 -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>
Angus Salkeld [Wed, 27 Jun 2012 05:20:45 +0000 (15:20 +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>
Jenkins [Tue, 26 Jun 2012 16:22:36 +0000 (16:22 +0000)]
Merge "Do not remove qpid-cpp-server as it is part of openstack erase"
Steven Hardy [Tue, 26 Jun 2012 15:41:17 +0000 (16:41 +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>
Angus Salkeld [Tue, 26 Jun 2012 13:23:27 +0000 (23:23 +1000)]
Add nested templates that implement a simple proxy/loadbalancer
Change-Id: I49f12e399f565d77955cf26288d182d0165422a0
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Angus Salkeld [Tue, 26 Jun 2012 08:57:54 +0000 (18:57 +1000)]
Pass the stack_id into the resource_metadata_update
Change-Id: I2b98592cf3970e3cd79ae7002504fb34cf2d42cd
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Steven Dake [Tue, 26 Jun 2012 06:11:51 +0000 (23:11 -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>
Ian Main [Tue, 26 Jun 2012 04:06:02 +0000 (21:06 -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>
Jeff Peeler [Mon, 25 Jun 2012 22:04:25 +0000 (18:04 -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>
Jeff Peeler [Mon, 25 Jun 2012 16:47:23 +0000 (12:47 -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>
Steven Hardy [Mon, 25 Jun 2012 13:15:51 +0000 (14:15 +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>
Steven Hardy [Mon, 25 Jun 2012 09:16:06 +0000 (10:16 +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>
Jenkins [Sun, 24 Jun 2012 04:27:46 +0000 (04:27 +0000)]
Merge "Add uninstall script for Heat"
Jenkins [Sun, 24 Jun 2012 04:25:38 +0000 (04:25 +0000)]
Merge "Fix path to cloudinit directory"
Jeff Peeler [Sun, 24 Jun 2012 02:41:30 +0000 (22:41 -0400)]
Add uninstall script for Heat
Change-Id: I1f0cbde19f5b75106d93cafdbd0b8fbf47cbbfe0
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
Ian Main [Fri, 22 Jun 2012 15:48:23 +0000 (08:48 -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>
Ian Main [Fri, 22 Jun 2012 16:55:17 +0000 (09:55 -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>
Jeff Peeler [Fri, 22 Jun 2012 16:26:38 +0000 (12:26 -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>
Zane Bitter [Fri, 22 Jun 2012 15:30:28 +0000 (17:30 +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>
Jenkins [Fri, 22 Jun 2012 11:05:24 +0000 (11:05 +0000)]
Merge "heat API : Add support for ContentType=JSON query parameter"
Angus Salkeld [Fri, 22 Jun 2012 04:41:20 +0000 (14:41 +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>
Angus Salkeld [Fri, 22 Jun 2012 04:11:01 +0000 (14:11 +1000)]
Don't use json.dumps() on the output of get_template
Change-Id: I913e9f9e2b90cd983fb9674b18b6c81d66129e6c
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Angus Salkeld [Fri, 22 Jun 2012 02:01:55 +0000 (12:01 +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>
Steven Dake [Thu, 21 Jun 2012 22:05:00 +0000 (15:05 -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>
Steven Hardy [Thu, 21 Jun 2012 09:52:25 +0000 (10:52 +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>
Zane Bitter [Thu, 21 Jun 2012 13:20:16 +0000 (15:20 +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>
Steven Hardy [Thu, 21 Jun 2012 13:03:19 +0000 (14:03 +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>
Angus Salkeld [Thu, 21 Jun 2012 10:10:53 +0000 (20:10 +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>
Angus Salkeld [Thu, 21 Jun 2012 04:36:19 +0000 (14:36 +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>
Angus Salkeld [Thu, 21 Jun 2012 04:54:38 +0000 (14:54 +1000)]
Use the correct resource name
Change-Id: I25d6962dfcc75b703aae6489cd0e751317029bc6
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Tomas Sedovic [Tue, 19 Jun 2012 12:54:27 +0000 (14:54 +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
Jenkins [Wed, 20 Jun 2012 15:24:37 +0000 (15:24 +0000)]
Merge "Don't remove resources from the DB during HA restart"
Angus Salkeld [Wed, 20 Jun 2012 13:49:26 +0000 (23:49 +1000)]
DB: add stack status & reason, resource metadata
Change-Id: I369aa688fa9890a5484de417a9995e7f04f34ad2
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Angus Salkeld [Wed, 20 Jun 2012 12:21:24 +0000 (22:21 +1000)]
Use the resource.state_description
Change-Id: I114067f3bb91c6d38b3c4c69af842f4f3585810b
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Zane Bitter [Wed, 20 Jun 2012 11:58:26 +0000 (13:58 +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>
Angus Salkeld [Wed, 20 Jun 2012 11:24:44 +0000 (21:24 +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>
Angus Salkeld [Wed, 20 Jun 2012 04:01:29 +0000 (14:01 +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>
Angus Salkeld [Wed, 20 Jun 2012 02:23:55 +0000 (12:23 +1000)]
Work around keystone strangeness (error deleting user)
Fixes: #144
Change-Id: Ib9298605accc3fc7d12112a4fb57df2b4746864a
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Angus Salkeld [Tue, 19 Jun 2012 23:37:23 +0000 (09:37 +1000)]
Fix db exception description
Change-Id: Ie7c1076e9cf5be1d6d63d3af7bc90933c1e588f7
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>