]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
13 years agoKill few pep8 errors
Steven Dake [Fri, 11 May 2012 22:07:34 +0000 (15:07 -0700)]
Kill few pep8 errors

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoProperly test ref valid against proper input
Steven Dake [Fri, 11 May 2012 21:58:14 +0000 (14:58 -0700)]
Properly test ref valid against proper input

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoUse manager to test ref validation
Steven Dake [Fri, 11 May 2012 21:55:24 +0000 (14:55 -0700)]
Use manager to test ref validation

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoAdd test cases to test valid and invalid keys in FindInMap
Steven Dake [Fri, 11 May 2012 21:52:31 +0000 (14:52 -0700)]
Add test cases to test valid and invalid keys in FindInMap

Partially Fixes issue #111

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoList stacks tests
Ian Main [Fri, 11 May 2012 20:54:40 +0000 (13:54 -0700)]
List stacks tests

Implements a list stacks test.  This one calls straight into engine
manager.

Signed-off-by: Ian Main <imain@redhat.com>
13 years agoMove list_events into the class.
Ian Main [Fri, 11 May 2012 18:14:08 +0000 (11:14 -0700)]
Move list_events into the class.

I think I went too far last time, this should at least be a method
of the class.

Signed-off-by: Ian Main <imain@redhat.com>
13 years agoFactor out a start_wordpress_stack()
Ian Main [Fri, 11 May 2012 17:47:17 +0000 (10:47 -0700)]
Factor out a start_wordpress_stack()

There was a lot of code duplication in the tests so I factored out
a function to start a wordpress stack.

Signed-off-by: Ian Main <imain@redhat.com>
13 years agoAdd event_list test.
Ian Main [Fri, 11 May 2012 17:23:38 +0000 (10:23 -0700)]
Add event_list test.

I moved parse_event out of the method and into the class so we could
call it from the event_list test.

Signed-off-by: Ian Main <imain@redhat.com>
13 years agoAdd uninstall script
Zane Bitter [Fri, 11 May 2012 16:54:38 +0000 (18:54 +0200)]
Add uninstall script

Signed-off-by: Zane Bitter <zbitter@redhat.com>
13 years agoAdd Getting Started guide to repo
Zane Bitter [Fri, 11 May 2012 16:54:38 +0000 (18:54 +0200)]
Add Getting Started guide to repo

Convert the Getting Started wiki page to ReStructuredText format and add it
to the repository. Also add a script that will extract the shell commands
from the document and run them, so we can use it as an integration test.

The script can be run using the command:
    > bash -c "$(./tools/rst2script.sed docs/GettingStarted.rst)"

Related: #84

Signed-off-by: Zane Bitter <zbitter@redhat.com>
13 years agoAdd cfn-get-metadata to the manifest
Zane Bitter [Fri, 11 May 2012 16:54:38 +0000 (18:54 +0200)]
Add cfn-get-metadata to the manifest

Signed-off-by: Zane Bitter <zbitter@redhat.com>
13 years agoFixed problems with starting MySQL in heat-db-setup
Zane Bitter [Fri, 11 May 2012 16:54:38 +0000 (18:54 +0200)]
Fixed problems with starting MySQL in heat-db-setup

Signed-off-by: Zane Bitter <zbitter@redhat.com>
13 years agoAdd test_validate_ref for invalid and valid inputs
Steven Dake [Fri, 11 May 2012 16:41:51 +0000 (09:41 -0700)]
Add test_validate_ref for invalid and valid inputs

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoCheck for invalid Fn::FindInMap key
Steven Dake [Fri, 11 May 2012 15:33:13 +0000 (08:33 -0700)]
Check for invalid Fn::FindInMap key

Partially Fixes Issue #111

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoCheck for invalid Ref keys in validate
Steven Dake [Fri, 11 May 2012 15:30:17 +0000 (08:30 -0700)]
Check for invalid Ref keys in validate

Partially Fixes Issue #111

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoTEST: slightly better version with minimal template in place.
Angus Salkeld [Fri, 11 May 2012 00:45:35 +0000 (10:45 +1000)]
TEST: slightly better version with minimal template in place.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdd volumeattachment validation
Steven Dake [Fri, 11 May 2012 00:10:53 +0000 (17:10 -0700)]
Add volumeattachment validation

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoAllowed the database call to return no parsed template.
Chris Alfonso [Thu, 10 May 2012 19:31:31 +0000 (15:31 -0400)]
Allowed the database call to return no parsed template.

The database impl was raising an exception if no parsed template
exists.  The logic that was looking up the parsed template
expects None to be returned if the template isn't stored.

* I also fixed some pep8 errors.

13 years agoAdding a deepcopy of the template before stack create validation
Chris Alfonso [Thu, 10 May 2012 19:02:46 +0000 (15:02 -0400)]
Adding a deepcopy of the template before stack create validation

Calling stack.validate will modify the stack's template, which
we don't want to do.  We just want to validate the template and move
on with an already parsed template.

13 years agoAdd stack delete test, and set stack to DELETE_COMPLETE when done.
Chris Alfonso [Thu, 10 May 2012 18:04:16 +0000 (14:04 -0400)]
Add stack delete test, and set stack to DELETE_COMPLETE when done.

13 years agoRemoving stack validation on create
Chris Alfonso [Thu, 10 May 2012 17:40:15 +0000 (13:40 -0400)]
Removing stack validation on create

13 years agoAdding stack create test
Chris Alfonso [Wed, 9 May 2012 20:49:45 +0000 (16:49 -0400)]
Adding stack create test

13 years agoValidate invalid mountpoint.device entries
Steven Dake [Wed, 9 May 2012 20:35:22 +0000 (13:35 -0700)]
Validate invalid mountpoint.device entries

Since KVM only allows /dev/vd[a-z], we validate that implementation-specific
sd[a-z] is rejected by heat validation.

See:
http://docs.openstack.org/trunk/openstack-compute/admin/content/managing-volumes.html
Search device name

Resolves issue #71

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoAllow sending events using metadata server
Tomas Sedovic [Wed, 9 May 2012 16:23:22 +0000 (18:23 +0200)]
Allow sending events using metadata server

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
13 years agoTypo in a logging declaration
Tomas Sedovic [Wed, 9 May 2012 15:02:28 +0000 (17:02 +0200)]
Typo in a logging declaration

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
13 years agoFix stack creation - CREATE_FAILED issue
Chris Alfonso [Wed, 9 May 2012 13:45:15 +0000 (09:45 -0400)]
Fix stack creation - CREATE_FAILED issue

The stack creation call to validate the stack was resetting the
stack template attribute.  I've made a copy of the stack purely
for validation purposes.

13 years agoAdd ability to automate testing with tox.
Jeff Peeler [Tue, 8 May 2012 21:39:08 +0000 (17:39 -0400)]
Add ability to automate testing with tox.

Install tox via easy_install. Tox automates the creation of multiple
virtual environments, each of which can be used with a different
interpreter or specific custom tests (and is what StackForge uses).

Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
13 years agoAdd option to exclude pep8 examination to run_test.sh.
Jeff Peeler [Tue, 8 May 2012 18:41:21 +0000 (14:41 -0400)]
Add option to exclude pep8 examination to run_test.sh.

Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
13 years agoAdd test coverage option to run_tests.sh
Jeff Peeler [Tue, 8 May 2012 15:31:25 +0000 (11:31 -0400)]
Add test coverage option to run_tests.sh

Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
13 years agoConnect up the waitcondition code to poll the metadata for the signal.
Angus Salkeld [Mon, 7 May 2012 13:04:35 +0000 (23:04 +1000)]
Connect up the waitcondition code to poll the metadata for the signal.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoSave to parsed template as that is used in the parser.
Angus Salkeld [Mon, 7 May 2012 12:04:04 +0000 (22:04 +1000)]
Save to parsed template as that is used in the parser.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoWaitCondition: fix the url to the new metadata server.
Angus Salkeld [Mon, 7 May 2012 10:49:39 +0000 (20:49 +1000)]
WaitCondition: fix the url to the new metadata server.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdd WaitConditions to HA template
Angus Salkeld [Mon, 7 May 2012 10:47:28 +0000 (20:47 +1000)]
Add WaitConditions to HA template

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoDownload cfn tools from the master branch.
Angus Salkeld [Mon, 7 May 2012 10:46:44 +0000 (20:46 +1000)]
Download cfn tools from the master branch.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoEscape the quotes going into cfn-signal shell command.
Angus Salkeld [Mon, 7 May 2012 10:15:02 +0000 (20:15 +1000)]
Escape the quotes going into cfn-signal shell command.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoMore peppy fixes...
Angus Salkeld [Mon, 7 May 2012 08:58:36 +0000 (18:58 +1000)]
More peppy fixes...

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdd implementation to cfn-signal
Angus Salkeld [Mon, 7 May 2012 08:29:17 +0000 (18:29 +1000)]
Add implementation to cfn-signal

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoFix undefined LOG variable in db.session
Angus Salkeld [Mon, 7 May 2012 08:27:35 +0000 (18:27 +1000)]
Fix undefined LOG variable in db.session

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoRemove unused "cloudinit_path" setup in resources.py
Angus Salkeld [Mon, 7 May 2012 08:25:48 +0000 (18:25 +1000)]
Remove unused "cloudinit_path" setup in resources.py

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoMetadata: Add bind_host to the config
Angus Salkeld [Mon, 7 May 2012 08:25:03 +0000 (18:25 +1000)]
Metadata: Add bind_host to the config

This needs to be set to the nova interface to work.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoRegister metadata server's entry point with Engine
Tomas Sedovic [Sat, 5 May 2012 01:01:31 +0000 (03:01 +0200)]
Register metadata server's entry point with Engine

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
13 years agoRemove obsoleted metadata files
Tomas Sedovic [Sat, 5 May 2012 01:00:16 +0000 (03:00 +0200)]
Remove obsoleted metadata files

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
13 years agoConnect metadata server to the engine via RPC
Tomas Sedovic [Fri, 4 May 2012 13:16:11 +0000 (15:16 +0200)]
Connect metadata server to the engine via RPC

Similarly to the way heat-api works, the engine does all the heavy lifting (db
access, etc.) while the metadata server provides the API layer that communicates
with the engine.

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
13 years agoMoving key validation into instance validate
Chris Alfonso [Fri, 4 May 2012 18:53:17 +0000 (14:53 -0400)]
Moving key validation into instance validate

13 years agoApparently boto expects / to be list stacks.
Ian Main [Fri, 4 May 2012 18:23:09 +0000 (11:23 -0700)]
Apparently boto expects / to be list stacks.

This patch just makes / redirect to list_stacks.

Signed-off-by: Ian Main <imain@redhat.com>
13 years agoValidateTemplate API call framework
Steven Dake [Fri, 4 May 2012 17:09:41 +0000 (10:09 -0700)]
ValidateTemplate API call framework

This is a start on issue #111

While no actual validation is done by this patch, this patch introduces
the framework for validating in each of the resource types and returning
an appropriate error when a validation error occurs.

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoFix the sql in the rails template (didn't work with the mysql in f16)
Angus Salkeld [Fri, 4 May 2012 01:21:55 +0000 (11:21 +1000)]
Fix the sql in the rails template (didn't work with the mysql in f16)

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agouncommenting the metadata server attribute so the tests work
Chris Alfonso [Thu, 3 May 2012 21:45:18 +0000 (17:45 -0400)]
uncommenting the metadata server attribute so the tests work

13 years agoValidating the KeyName against nova on stack_create
Chris Alfonso [Thu, 3 May 2012 19:06:20 +0000 (15:06 -0400)]
Validating the KeyName against nova on stack_create

Fixes Issue #98

13 years agoConnect cfn utils to the remote server
Tomas Sedovic [Thu, 3 May 2012 14:19:17 +0000 (16:19 +0200)]
Connect cfn utils to the remote server

The cfn_helper's `Metadata` class can now connect to the metadata server
prodived it's URL is known and available.

Engine will pass metadata server's URL via the User Data to the following file:

    /var/lib/cloud/data/cfn-metadata-server

If the file doesn't exist or the server is unreachable, cfntools will read
metadata from the `/var/lib/cloud/data/cfn-init-data` file as they did so far.

Note that Engine dosen't currently know the metadata server's URL so it's not
passing it to the instance yet.

13 years agoFix cfn-get-metadata params and output
Tomas Sedovic [Thu, 3 May 2012 14:33:53 +0000 (16:33 +0200)]
Fix cfn-get-metadata params and output

Marked the `--stack` and `--resource` parameters as required and set it to
actually write the metadata out.

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
13 years agoFixed the interpretation of the file extension.
Angus Salkeld [Thu, 3 May 2012 13:26:25 +0000 (23:26 +1000)]
Fixed the interpretation of the file extension.

My initial lack of understanding of "is" and "==".

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoOnly showing the Outputs when the status of a stack is CREATE_COMPLETE
Chris Alfonso [Thu, 3 May 2012 13:10:13 +0000 (09:10 -0400)]
Only showing the Outputs when the status of a stack is CREATE_COMPLETE

This fixes issues #96

13 years agoFix unbound error in cfn_helper.
Angus Salkeld [Thu, 3 May 2012 12:33:23 +0000 (22:33 +1000)]
Fix unbound error in cfn_helper.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdding mime_string to the Instance instance and fixing tests
Chris Alfonso [Thu, 3 May 2012 12:15:08 +0000 (08:15 -0400)]
Adding mime_string to the Instance instance and fixing tests

13 years agoFix some indentation and pep errors
Angus Salkeld [Thu, 3 May 2012 12:01:09 +0000 (22:01 +1000)]
Fix some indentation and pep errors

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoHack the Rails template to work.
Angus Salkeld [Thu, 3 May 2012 04:37:53 +0000 (14:37 +1000)]
Hack the Rails template to work.

- set the image name mapping
- we don't have AWS::IAM::AccessKey yet
- we don't have PublicDnsName yet

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdd Rails template example
Angus Salkeld [Wed, 2 May 2012 05:48:34 +0000 (15:48 +1000)]
Add Rails template example

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdd dummy cfn-signal
Angus Salkeld [Thu, 3 May 2012 04:34:57 +0000 (14:34 +1000)]
Add dummy cfn-signal

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdd WaitConditions
Angus Salkeld [Thu, 3 May 2012 04:34:39 +0000 (14:34 +1000)]
Add WaitConditions

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoSplit the resourses up into seperate files.
Angus Salkeld [Thu, 3 May 2012 04:34:13 +0000 (14:34 +1000)]
Split the resourses up into seperate files.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoHandle "sources" in cfn-init
Angus Salkeld [Wed, 2 May 2012 05:44:38 +0000 (15:44 +1000)]
Handle "sources" in cfn-init

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoInitial metadata server API
Tomas Sedovic [Wed, 2 May 2012 11:51:08 +0000 (13:51 +0200)]
Initial metadata server API

This implements the basic capabilities we need from the metadata server. Each
API call returns proper HTTP responses (404, 409, etc.).

The server is currently not connected to a real database. Rather, it uses a
simple mock. This allows for quick initial API changes before things stabilize.

The immediate next steps are to integrate the server with the cfn tools
(cfn-metadata being the prime candidate) to see what may be wrong/missing.

And then to connect the server to a real database.

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
13 years agoAdd very basic support for installing (apt, python & gems)
Angus Salkeld [Wed, 2 May 2012 02:13:19 +0000 (12:13 +1000)]
Add very basic support for installing (apt, python & gems)

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdd cfn-get-metadata to files section of cfntools tdls
Jeff Peeler [Tue, 1 May 2012 18:48:16 +0000 (14:48 -0400)]
Add cfn-get-metadata to files section of cfntools tdls

Found while writing test for jeos creation

Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
13 years agoModified README in tools directory to explain a few more tools
Steven Dake [Tue, 1 May 2012 17:02:48 +0000 (10:02 -0700)]
Modified README in tools directory to explain a few more tools

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoScoping the session per thread (request).
Chris Alfonso [Tue, 1 May 2012 15:04:34 +0000 (11:04 -0400)]
Scoping the session per thread (request).

Fixes issue #94
http://docs.sqlalchemy.org/en/rel_0_7/orm/session.html#sqlalchemy.orm.scoped_session

13 years agoOops, meant for website repo.
Ian Main [Mon, 30 Apr 2012 22:03:39 +0000 (15:03 -0700)]
Oops, meant for website repo.

13 years agoHeat Logo
Ian Main [Mon, 30 Apr 2012 21:57:38 +0000 (14:57 -0700)]
Heat Logo

SVG format of heat logo.

13 years agoSkipping the import if its deps aren't installed, use --no-skip if you want to run...
Chris Alfonso [Mon, 30 Apr 2012 17:04:51 +0000 (13:04 -0400)]
Skipping the import if its deps aren't installed, use --no-skip if you want to run this

13 years agoCopied the python-novaclient test code to avoid importing via python path
Chris Alfonso [Mon, 30 Apr 2012 14:39:51 +0000 (10:39 -0400)]
Copied the python-novaclient test code to avoid importing via python path

13 years agoAdding the metadata.log file
Chris Alfonso [Mon, 30 Apr 2012 14:13:15 +0000 (10:13 -0400)]
Adding the metadata.log file

13 years agoFinish necessary changes related to jeos_create move
Jeff Peeler [Fri, 27 Apr 2012 20:44:11 +0000 (16:44 -0400)]
Finish necessary changes related to jeos_create move

As a result of moving jeos_create, the code is now used during test
execution. The library libxml2 which was previously being used is not
available in pip, so lxml has been swapped instead.

Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
13 years agoAdd skeleton structure for the metadata server
Tomas Sedovic [Fri, 27 Apr 2012 16:40:49 +0000 (18:40 +0200)]
Add skeleton structure for the metadata server

13 years agoUpdate heat-api docstring
Tomas Sedovic [Fri, 27 Apr 2012 13:25:50 +0000 (15:25 +0200)]
Update heat-api docstring

13 years agomore pep fixups.
Angus Salkeld [Fri, 27 Apr 2012 03:12:33 +0000 (13:12 +1000)]
more pep fixups.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdd cfn-get-metadata make all cfn tools more consistent
Angus Salkeld [Fri, 27 Apr 2012 03:02:58 +0000 (13:02 +1000)]
Add cfn-get-metadata make all cfn tools more consistent

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoopenstack-common: timeutils and importutils seperated out
Angus Salkeld [Fri, 27 Apr 2012 00:21:43 +0000 (10:21 +1000)]
openstack-common: timeutils and importutils seperated out

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoopenstack-common: update cfg.py
Angus Salkeld [Thu, 26 Apr 2012 22:28:55 +0000 (08:28 +1000)]
openstack-common: update cfg.py

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoMove jeos_create into utils so it can be imported
Jeff Peeler [Thu, 26 Apr 2012 20:51:00 +0000 (16:51 -0400)]
Move jeos_create into utils so it can be imported

The main reason for this move is so that jeos_create can be tested with
the aide of Mox.

Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
13 years agoPut Starting Heat API in log file and add logging setup to bin/heat-api
Steven Dake [Thu, 26 Apr 2012 18:02:15 +0000 (11:02 -0700)]
Put Starting Heat API in log file and add logging setup to bin/heat-api

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoRemove stray print debug message
Steven Dake [Thu, 26 Apr 2012 17:55:23 +0000 (10:55 -0700)]
Remove stray print debug message

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoQuiet down the QPID logging since it isn't helpful and makes logs hard to read
Steven Dake [Thu, 26 Apr 2012 17:49:10 +0000 (10:49 -0700)]
Quiet down the QPID logging since it isn't helpful and makes logs hard to read

Should likely be removed later, but for the moment, logs readable without
grep now.

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoKill prints and replace with LOG in heat/rpc/__init__.py
Steven Dake [Thu, 26 Apr 2012 17:29:26 +0000 (10:29 -0700)]
Kill prints and replace with LOG in heat/rpc/__init__.py

Signed-off-by: Steven Dake <sdake@redhat.com>
13 years agoStub out system calls in metadata_files test
Tomas Sedovic [Thu, 26 Apr 2012 15:29:42 +0000 (17:29 +0200)]
Stub out system calls in metadata_files test

Since CommandRunner now honours `runas`, the tests would have to be run as root
for the commands to succeed.

13 years agoImplement runas for cfn-hup
Tomas Sedovic [Thu, 26 Apr 2012 15:27:25 +0000 (17:27 +0200)]
Implement runas for cfn-hup

As a side effect, this fixes #109. By running everything through `su -c`, all
the piping and redirection issues are outsourced there.

13 years agoAdd test artifacts to gitignore
Angus Salkeld [Thu, 26 Apr 2012 14:32:15 +0000 (00:32 +1000)]
Add test artifacts to gitignore

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoMerge branch 'ha'
Angus Salkeld [Thu, 26 Apr 2012 14:22:24 +0000 (00:22 +1000)]
Merge branch 'ha'

Conflicts:
heat/db/sqlalchemy/session.py

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoHandle cfn-hup non-value parameters
Angus Salkeld [Thu, 26 Apr 2012 14:05:59 +0000 (00:05 +1000)]
Handle cfn-hup non-value parameters

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoMoving db error wrapping into heat session to avoid a nova import
Chris Alfonso [Thu, 26 Apr 2012 13:33:01 +0000 (09:33 -0400)]
Moving db error wrapping into heat session to avoid a nova import

13 years agoAdd an easier way to update the cfn scripts
Angus Salkeld [Thu, 26 Apr 2012 13:16:59 +0000 (23:16 +1000)]
Add an easier way to update the cfn scripts

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoFix up the template - some scripts not right.
Angus Salkeld [Thu, 26 Apr 2012 13:16:25 +0000 (23:16 +1000)]
Fix up the template - some scripts not right.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoFix the cfn logging
Angus Salkeld [Thu, 26 Apr 2012 13:15:39 +0000 (23:15 +1000)]
Fix the cfn logging

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoFix userdata mime creation
Angus Salkeld [Thu, 26 Apr 2012 12:51:38 +0000 (22:51 +1000)]
Fix userdata mime creation

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoFix userdata mime creation
Angus Salkeld [Thu, 26 Apr 2012 12:51:38 +0000 (22:51 +1000)]
Fix userdata mime creation

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdd a real creds file for the cfn-hup config tests
Angus Salkeld [Thu, 26 Apr 2012 11:46:02 +0000 (21:46 +1000)]
Add a real creds file for the cfn-hup config tests

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoRe-add the file logging to cfn tools.
Angus Salkeld [Thu, 26 Apr 2012 11:45:01 +0000 (21:45 +1000)]
Re-add the file logging to cfn tools.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoMake sure AWS::StackName is avaliable
Angus Salkeld [Thu, 26 Apr 2012 07:01:38 +0000 (17:01 +1000)]
Make sure AWS::StackName is avaliable

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoAdd cfn-hup config into template
Angus Salkeld [Thu, 26 Apr 2012 07:01:13 +0000 (17:01 +1000)]
Add cfn-hup config into template

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
13 years agoCopy the single inst. wordpress template to With_HA
Angus Salkeld [Thu, 26 Apr 2012 04:13:56 +0000 (14:13 +1000)]
Copy the single inst. wordpress template to With_HA

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