88 Commits

Author SHA1 Message Date
Steven Hardy
005b613f8b heat templates : Add openshift template for pre-built jeos
Add new openshift template which uses a pre-built JEOS
also creates the example application allowing a fairly
quick full demo of a two-instance openshift setup

Fixes #186

Change-Id: I9bd886b0717c8b0d810eff036b76883b537c2421
Signed-off-by: Steven Hardy <shardy@redhat.com>
2012-08-13 19:27:53 +01:00
Jenkins
70bdc38a44 Merge "change amd64 reference to x86_64 to match latest cfntools" 2012-08-10 19:06:22 +00:00
Steven Dake
7f8c5fabed change amd64 reference to x86_64 to match latest cfntools
Change-Id: I11f4bd974326c7f1b4e287389b22c5ec3f20bdf9
Signed-off-by: Steven Dake <sdake@redhat.com>
2012-08-10 11:43:02 -07:00
Steven Dake
69cfc124bc Remove crankcase patch since fix was merged upstream
Added a patch to force yum to retry indefinately on crankcase builds
because the OpenShift repositories were too busy.  I submitted this upstream
in:

  https://github.com/openshift/crankcase/pull/336

and it was merged.

As a result, removing this workaround.

Change-Id: I26e0a162d5cfb4bc23843c93678318ff21610973
Signed-off-by: Steven Dake <sdake@redhat.com>
2012-08-08 15:01:47 -07:00
Steven Dake
31718b1e14 Force rpm to retry indefinately during crankcase build
If RPM is not forced, sometimes packages will fail to download within the
default 10 retries.  This results in crankcase failing to build OpenShift.

Change-Id: I5174928fc2ac205dcd7818ecf1da6b8e32f48e08
Signed-off-by: Steven Dake <sdake@redhat.com>
2012-08-03 19:33:38 -07:00
Steven Hardy
ea2db73166 heat templates : update Openshift template to add node instance
Update openshift templat to add a second instance running
the node to the existing broker.  Move to crankcase master
and attempt to work around build issues.

Ref #186

Change-Id: If7d1b39e1072d3934f37817be3d7773edd7785c3
Signed-off-by: Steven Hardy <shardy@redhat.com>
2012-08-02 18:58:32 +01:00
Angus Salkeld
3c6e40f2bb Make a template that demonstrates instance monitoring and restarting.
We use cfn-push-stats to send a heartbeat and if we don't get
it within the set interval we restart the instance.

Other changes to make this work:
- clear the waitcondition when it is deleted.
- set the resource id to None when deleted, else it won't re-create
  properly.
- don't run watch alarms if the stack is not completed.

Change-Id: I5dfc8b372f557cf43379c6c5b7436d1010f83e3c
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-07-25 21:45:09 +10:00
Tomas Sedovic
9c75b6d3b0 Add AWS::RDS::DBInstance
Fixes #163

This is an initial implementation of the DBInstance resource type and a
sample Wordpress template showing it off.

Change-Id: I5e156dc58eee563ae9de068664bafa1af1fb5ffe
Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
2012-07-23 18:38:16 +02:00
Angus Salkeld
deebc5c42a make the autoscaling template easier to debug
shorten the period and lower the thresholds

Change-Id: I3d621fadacc6e77002d100cf725d970671475106
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-07-23 14:58:11 +10:00
Angus Salkeld
b48d869244 Add python-psutil and fix cfn-push-stats options
Change-Id: Ic88e1e886c5f8ccbcbc5bc49fa612366c7faeae5
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-07-23 13:09:19 +10:00
Angus Salkeld
0f4c86bd3a Combined autoscaling and loadbalancer
Change-Id: Ib2cff867eb5d9fbee8cedb828e9c35a93436cbe5
2012-07-20 16:08:44 +10:00
Zane Bitter
e4eaca5d58 Fix the WordPress puppet template syntax
The template was not valid JSON due to an apparent copy-and-paste error.

Change-Id: I5fb4afe6597b2f469fb5219494feb745d083bf52
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2012-07-11 11:56:13 -04:00
Angus Salkeld
4d79e24097 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>
2012-07-06 08:50:53 +00:00
Jenkins
767c41850f Merge "Pass Tags into scheduler_hints" 2012-07-05 14:18:35 +00:00
Angus Salkeld
dfacb9f49b 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>
2012-07-05 22:01:01 +10:00
Angus Salkeld
f71dc82e14 Pass Tags into scheduler_hints
Change-Id: Idad6090c7baf0db943c999585dfe3bf33fc9492e
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-07-05 21:18:26 +10:00
Angus Salkeld
894272f214 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>
2012-07-03 14:55:56 +10:00
Angus Salkeld
f557b22e7e Add nested templates that implement a simple proxy/loadbalancer
Change-Id: I49f12e399f565d77955cf26288d182d0165422a0
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-06-26 23:23:27 +10:00
Steven Hardy
89dca2fd6a 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>
2012-06-21 14:05:37 +01:00
Zane Bitter
f6e69f8419 Add example templates for nested stacks
Change-Id: I3b5fb7018a606895007dad589f1dcbeb6b0defe6
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2012-06-18 18:14:11 +02:00
Angus Salkeld
88c8bdee3f Lengthen the timeout of the WaitCondition in the HA template
Change-Id: I059075b80dfac0472ae2e2e47d14b2ee4093a530
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-06-18 15:10:30 +10:00
Angus Salkeld
360c279c49 add user auth to ha template
Change-Id: I044d153bc33de08c6736fd4dd32380ceb0bf8caa
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-06-05 11:01:42 +10:00
Steven Dake
abd4b735e5 U10 wordpress template
Change-Id: I25beb7b48e287b3097379c1e1f92adc309ce9c83
Signed-off-by: Steven Dake <sdake@redhat.com>
2012-06-01 13:55:54 -07:00
Angus Salkeld
07d1eb9b78 Fix the HA template (sed the username/password)
Change-Id: I835a9f6d2a9abfdeb5af8fb703c8abae5afae2d1
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-05-31 14:28:45 +10:00
Angus Salkeld
bd28133849 Add instance restarter
Change-Id: I8ef28efc7d86a1a3a44f4784cb496c415a14f95c
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-05-30 23:32:07 +10:00
Tomas Sedovic
f3913a9a3e cloudwatch: set HA template to send watch data
The Wordpress HA template is now able to utilize the cfn-push-stats and send
alarm messages to the metadata server.

Change-Id: I52b615d3401dc2665e2b30e4a925d61ed204c827
Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
2012-05-25 14:20:13 +02:00
Angus Salkeld
1d5aec19d7 Add the basic cloudwatch feature
Fix watch db tables and silly programming errors.
get basic posting data to metadata server working
add watch_rule_get_all()
check for alarms in a periodic task
delete watch_data when the rule is deleted
add a last_evaluated field to the watch_rule
remove unused option to watch_data_get
take better account of the sample period.
- still much to be done here (evaluation periods).
add some useful stats to cfn-push-stats
fix how the metric is accessed
fix a divide by zero

Change-Id: Iaf98499d0e3ac6d6f951ea38b3b0f409669258da
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-05-25 19:24:56 +10:00
Chris Alfonso
af8dab4570 Merge branch 'puppet_instances'
Conflicts:
	heat/api/v1/__init__.py
	heat/engine/parser.py
2012-05-21 15:39:11 -04:00
Zane Bitter
08c7936824 Fix copy-paste errors in template descriptions
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2012-05-21 15:44:26 +02:00
Chris Alfonso
bba73f4c75 Adding puppet and puppet master instances 2012-05-18 08:58:17 -04:00
Angus Salkeld
95e3a0165d Slim down the getting_started template.
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-05-14 21:15:23 +10:00
Angus Salkeld
f3c2d67cd5 Add WaitConditions to HA template
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-05-07 20:47:28 +10:00
Angus Salkeld
6d4a0dff6b Download cfn tools from the master branch.
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-05-07 20:46:44 +10:00
Angus Salkeld
6bae53753b Fix the sql in the rails template (didn't work with the mysql in f16)
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-05-04 11:22:20 +10:00
Angus Salkeld
07148b41e7 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>
2012-05-03 14:45:01 +10:00
Angus Salkeld
c273624c02 Add Rails template example
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-05-03 14:45:01 +10:00
Angus Salkeld
afb73a6e76 Add an easier way to update the cfn scripts
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-04-26 23:22:25 +10:00
Angus Salkeld
1eb0304080 Fix up the template - some scripts not right.
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-04-26 23:22:25 +10:00
Angus Salkeld
e5208d1d71 Add cfn-hup config into template
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-04-26 17:04:03 +10:00
Angus Salkeld
f03e901404 Copy the single inst. wordpress template to With_HA
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-04-26 17:04:03 +10:00
Steven Dake
87dac3d2c0 Wordpress 2 instance with EBS and EIP
srs.

Signed-off-by: Steven Dake <sdake@redhat.com>
2012-04-20 14:49:51 -07:00
Angus Salkeld
eac075e5e1 Fix another template attribute in the output section
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-04-18 16:18:16 +10:00
Angus Salkeld
9e79551d77 Fix the output attribute in single instance wp template
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2012-04-18 14:44:08 +10:00
Steven Dake
358920e136 Add WordPress_Single_Instance_With_EBS_EIP.template
This template uses EBS, EIP, security groups in a single instance.
Unfortunately because of issue #83 the template doesn't fully start.

Signed-off-by: Steven Dake <sdake@redhat.com>
2012-04-17 10:12:04 -07:00
Steven Dake
991b3fd18d Rename EBS_Volume to just EBS to pave way for EBS_EIP
Signed-off-by: Steven Dake <sdake@redhat.com>
2012-04-17 09:36:31 -07:00
Steven Dake
83e002fd3b Make WordPress_Single_Instance_With_EIP.template work
Note I receive an exception in engine.log:
ClientException: Associate floating ip failed (HTTP 500)

Signed-off-by: Steven Dake <sdake@redhat.com>
2012-04-17 09:30:21 -07:00
Zane Bitter
7afbd05da3 Fix invalid JSON in template
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2012-04-17 18:06:49 +02:00
Steven Dake
27832d617e Updated WordPress_Single_Instance.template to work properly.
Signed-off-by: Steven Dake <sdake@redhat.com>
2012-04-17 07:12:21 -07:00
Steven Dake
08ad2beab0 Update templates README with list of secure vs insecure templates
Signed-off-by: Steven Dake <sdake@redhat.com>
2012-04-16 20:45:26 -07:00
Steven Dake
9e2f208bff Make WordPress_Single_Instance_With_EBS_Volume.template functional
Signed-off-by: Steven Dake <sdake@redhat.com>
2012-04-16 20:44:00 -07:00