openstack/heat-templates
Code Issues Proposed changes

F18 WordPress_NoKey fixes

Browse Source 
The security group properties must be strings or we get validation
errors, and firewall-cmd rule addition should be permanent

Change-Id: Ia03947690ff8142b6e700c808a898283c7b8d095
This commit is contained in:
Steven Hardy 2013-09-18 10:06:20 +01:00
parent fbcdeb7004
commit 223b6b3b3b
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cfn/F18/WordPress_NoKey.yaml
View File

@ -41,18 +41,18 @@ Resources:
Properties:
GroupDescription: 'Enable HTTP access via port 80 plus SSH access'
SecurityGroupIngress:
- IpProtocol: icmp
FromPort: -1
ToPort: -1
CidrIp: 0.0.0.0/0
- IpProtocol: tcp
FromPort: 80
ToPort: 80
CidrIp: 0.0.0.0/0
- IpProtocol: tcp
FromPort: 22
ToPort : 22
CidrIp : 0.0.0.0/0
- IpProtocol: 'icmp'
FromPort: '-1'
ToPort: '-1'
CidrIp: '0.0.0.0/0'
- IpProtocol: 'tcp'
FromPort: '80'
ToPort: '80'
CidrIp: '0.0.0.0/0'
- IpProtocol: 'tcp'
FromPort: '22'
ToPort : '22'
CidrIp : '0.0.0.0/0'
WikiDatabase:
Type: AWS::EC2::Instance
Metadata:
@ -88,6 +88,9 @@ Resources:
'
- 'firewall-cmd --add-service=http
'
- 'firewall-cmd --permanent --add-service=http
'
- '# Setup MySQL root password and create a user

29
hot/F18/WordPress_NoKey.yaml
View File

@ -21,7 +21,7 @@ parameters:
constraints:
- allowed_values: [ F18-i386-cfntools, F18-x86_64-cfntools ]
description: >
Image ID bust be either F18-i386-cfntools or F18-x86_64-cfntools
Image ID must be either F18-i386-cfntools or F18-x86_64-cfntools
DBName:
type: string
description: WordPress database name
@ -72,18 +72,18 @@ resources:
properties:
GroupDescription: 'Enable HTTP access via port 80 plus SSH access'
SecurityGroupIngress:
- IpProtocol: icmp
FromPort: -1
ToPort: -1
CidrIp: 0.0.0.0/0
- IpProtocol: tcp
FromPort: 80
ToPort: 80
CidrIp: 0.0.0.0/0
- IpProtocol: tcp
FromPort: 22
ToPort : 22
CidrIp : 0.0.0.0/0
- IpProtocol: 'icmp'
FromPort: '-1'
ToPort: '-1'
CidrIp: '0.0.0.0/0'
- IpProtocol: 'tcp'
FromPort: '80'
ToPort: '80'
CidrIp: '0.0.0.0/0'
- IpProtocol: 'tcp'
FromPort: '22'
ToPort : '22'
CidrIp : '0.0.0.0/0'
wordpress_instance:
# Use an AWS resource type and switch to native compute instance as
@ -115,6 +115,7 @@ resources:
/opt/aws/bin/cfn-init
firewall-cmd --add-service=http
firewall-cmd --permanent --add-service=http
# Setup MySQL root password and create a user
mysqladmin -u root password $db_rootpassword
@ -146,4 +147,4 @@ outputs:
str_replace:
template: http://$host/wordpress
params:
host: { get_attr: [wordpress_instance, PublicIp] }
host: { get_attr: [wordpress_instance, PublicIp] }