openstack/heat
Code Issues Proposed changes
524 Commits 11 Branches 53 Tags
1852373470
Commit Graph

65 Commits

Author SHA1 Message Date
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
Steven Dake
dbfe16ff00 Updated templates/README directory to more clearly explain templates 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-16 16:46:27 -07:00
Steven Dake
2da09c064a Rename WordPress_Single_Instance_cfntools.template to not have cfntools in name 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-16 16:36:57 -07:00
Steven Dake
eca8d5aa8b Rename WordPress_Single_Instance.template to have gold in name 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-16 16:36:22 -07:00
Steven Dake
b5bf88aab5 Adjust cfn-init -f flag to be implicit 
Fixes issue #75 for WordPress_Single_Instance_cfntools.template

Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-16 16:34:53 -07:00
Steven Dake
162826f9d7 Adjust cfn-init to not use -f option 
Fixes issue #75 for WordPress_2_Instances_With_EBS_Volume.template

Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-16 16:33:45 -07:00
Steven Dake
71f884272a Adjust cfn-init to not take a parameter in the initialization 
WordPress_2_Instances.template

Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-16 16:32:09 -07:00
Steven Dake
20e10f2bf7 gold plating the WordPress_2_Instances template 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-16 14:12:19 -07:00
Steven Dake
6046cb1bdd Wordpress 2 with EBS working 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-16 13:52:05 -07:00
Steven Dake
f7d0e0572c Add a README to the templates directory to aid in navigation of the templates 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-15 19:13:12 -07:00
Steven Dake
67c6131536 Make Wordpress_2_Instances.template work properly 
note the mysql instance is not secure because both IPs must be known
ahead of time.  To resolve this problem, we will be using elastic IPs.

Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-15 17:45:09 -07:00
Steven Dake
ede22be715 Update WordPress_2_Instances.template to use cfntools and cfn-init 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-15 10:28:52 -07:00
Steven Dake
be21044ef8 Correct path to cfninit data 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-14 07:57:06 -07:00
Steven Dake
05f4df4893 Yet more typos in cfntools template 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-14 07:34:08 -07:00
Steven Dake
2d9253b076 Fix typo in template 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-14 07:27:15 -07:00
Steven Dake
c43659dd7a Add a cfn-init call to cfntools 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-14 07:23:20 -07:00
Tomas Sedovic
3cbb97ad00 Use security groups in the multi-instance wp template 2012-04-13 15:56:29 +02:00
Angus Salkeld
0ee8db4459 Add SecurityGroups to make is easier to use EIP 
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
 2012-04-13 20:15:46 +10:00
Chris Alfonso
1a3186dc6f fixing small sed typo 2012-04-12 14:00:53 -04:00
Tomas Sedovic
b633c768c4 Add elastic IP and userdata to 2-instance template 
Ref: #56

The 2-instance Wordpress template with EBS now uses Elastic IPs for both
servers. The IPs are referenced from the init scripts in UserData.

The template wasn't tested yet.
 2012-04-12 18:28:00 +02:00
Tomas Sedovic
ead1838fb7 Move the EIP settings into a different template 
We'll keep the WordPress_Single_Instance.template simple.
 2012-04-12 16:57:48 +02:00
Angus Salkeld
d41059f6a9 Initial ElasticIp work - not quite working 
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
 2012-04-12 13:23:15 +02:00
Jeff Peeler
01488938cf Add 32-bit tdls for Fedora 16,17 jeos (gold and cfntools) 
fixes #26

Note that the templates have been adjusted and the naming of the 32-bit
versions to i386 instead of i686. The install really is i686, but making
the arch match what is listed in the install ISO seems less confusing.

Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

Although the 32-bit version of Fedora (and others) ISOs are labeled with i386,
 2012-04-11 20:56:45 -04:00
Steven Dake
4b360e33c2 Rename cftools to cfntools in the wordpress single instance template 
Signed-off-by: Steven Dake <sdake@redhat.com>
 2012-04-10 18:01:59 -07:00