Wordpress 2 with EBS working

Signed-off-by: Steven Dake <sdake@redhat.com>

diff --git a/templates/WordPress_2_Instances_With_EBS_Volume.template b/templates/WordPress_2_Instances_With_EBS_Volume.template
index e408d0132f87e91708e9d7176fd966cee5eb0e3c..a3b65be43fb09d59609f4216efd226141f2e45a4 100644 (file)
--- a/templates/WordPress_2_Instances_With_EBS_Volume.template
+++ b/templates/WordPress_2_Instances_With_EBS_Volume.template
@@ -1,7 +1,7 @@
 {
   "AWSTemplateFormatVersion" : "2010-09-09",
 
-  "Description" : "AWS CloudFormation Sample Template WordPress_Multi_Instance: WordPress is web software you can use to create a beautiful website or blog. This template installs two instances: one running a WordPress deployment and the other using a  MySQL database with EBS volume to store the data.",
+  "Description" : "AWS CloudFormation Sample Template WordPress_Multi_Instance: WordPress is web software you can use to create a beautiful website or blog. This template installs two instances: one running a WordPress deployment and the other using a local MySQL database to store the data.",
 
   "Parameters" : {
 
@@ -69,7 +69,6 @@
       "AllowedPattern" : "[a-zA-Z0-9]*",
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
-
     "LinuxDistribution": {
       "Default": "F16",
       "Description" : "Distribution of choice",
@@ -92,55 +91,30 @@
       "cc1.4xlarge" : { "Arch" : "64" }
     },
     "DistroArch2AMI": {
-      "F16"      : { "32" : "F16-i386-gold", "64" : "F16-x86_64-gold" },
-      "F17"      : { "32" : "F17-i386-gold", "64" : "F17-x86_64-gold" },
-      "U10"      : { "32" : "U10-i386-gold", "64" : "U10-x86_64-gold" },
-      "RHEL-6.1" : { "32" : "rhel61-i386-gold", "64" : "rhel61-x86_64-gold" },
-      "RHEL-6.2" : { "32" : "rhel62-i386-gold", "64" : "rhel62-x86_64-gold" },
-      "RHEL-6.3" : { "32" : "rhel63-i386-gold", "64" : "rhel63-x86_64-gold" }
+      "F16"      : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" },
+      "F17"      : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
+      "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
+      "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
+      "RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
+      "RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
     }
   },
 
   "Resources" : {
-
-    "WebServerIPAddress" : {
-      "Type" : "AWS::EC2::EIP"
-    },
-
-    "WebServerIPAssoc" : {
-      "Type" : "AWS::EC2::EIPAssociation",
-      "Properties" : {
-        "InstanceId" : { "Ref" : "WebServer" },
-        "EIP" : { "Ref" : "WebServerIPAddress" }
-      }
-    },
-
-    "WikiDatabaseIPAddress" : {
-      "Type" : "AWS::EC2::EIP"
-    },
-
-    "WikiDatabaseIPAssoc" : {
-      "Type" : "AWS::EC2::EIPAssociation",
-      "Properties" : {
-        "InstanceId" : { "Ref" : "WikiDatabase" },
-        "EIP" : { "Ref" : "WikiDatabaseIPAddress" }
-      }
-    },
-
-    "WebServer": {
+    "WikiDatabase": {
       "Type": "AWS::EC2::Instance",
       "Metadata" : {
         "AWS::CloudFormation::Init" : {
           "config" : {
             "packages" : {
               "yum" : {
-                "httpd"        : [],
-                "wordpress"    : []
+                "mysql"        : [],
+                "mysql-server" : []
               }
-           },
+            },
             "services" : {
               "systemd" : {
-                "httpd"    : { "enabled" : "true", "ensureRunning" : "true" }
+                "mysqld"   : { "enabled" : "true", "ensureRunning" : "true" }
               }
             }
           }
@@ -151,33 +125,62 @@
                           { "Fn::FindInMap" : [ "AWSInstanceType2Arch", { "Ref" : "InstanceType" }, "Arch" ] } ] },
         "InstanceType"   : { "Ref" : "InstanceType" },
         "KeyName"        : { "Ref" : "KeyName" },
-        "SecurityGroups" : [
-          {"Ref" : "AdminAccessSecurityGroup"},
-          {"Ref" : "WebServerSecurityGroup"}
-        ],
         "UserData"       : { "Fn::Base64" : { "Fn::Join" : ["", [
           "#!/bin/bash -v\n",
-          "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ --e s/DB_HOST/", "/ /usr/share/wordpress/wp-config.php\n",
-          "sed --in-place --e \"s/DB_HOST\\s*',\\s*'localhost/DB_HOST', '", { "Ref": "WikiDatabaseIPAddress" },  "/\" /usr/share/wordpress/wp-config.php\n",
-          "cp /usr/share/wordpress/wp-config.php /usr/share/wordpress/wp-config.orig\n"
+          "/opt/aws/bin/cfn-init -f /var/lib/cloud/data/cfn-init-data\n",
+
+          "# Wait for the volume to appear\n",
+          "while [ ! -e /dev/vdb ]; do echo Waiting for volume to attach; sleep 1; done\n",
+          "parted /dev/vdb mklabel msdos\n",
+          "parted /dev/vdb mkpart primary ext3 1 1000\n",
+          "# Format the EBS volume and mount it\n",
+          "systemctl stop mysqld.service\n",
+          "sleep 1\n",
+          "mv /var/lib/mysql /var/lib/mysql.data\n",
+          "/sbin/mkfs -t ext3 /dev/vdb1\n",
+          "mkdir /var/lib/mysql\n",
+          "mount /dev/vdb1 /var/lib/mysql\n",
+          "chown mysql.mysql /var/lib/mysql\n",
+          "mv -n /var/lib/mysql.data/* /var/lib/mysql\n",
+          "systemctl start mysqld.service\n",
+          "sleep 1\n",
+          "# Setup MySQL root password and create a user\n",
+          "mysqladmin -u root password '", { "Ref" : "DBRootPassword" }, "'\n",
+          "cat << EOF | mysql -u root --password='", { "Ref" : "DBRootPassword" }, "'\n",
+          "CREATE DATABASE ", { "Ref" : "DBName" }, ";\n",
+          "GRANT ALL PRIVILEGES ON ", { "Ref" : "DBName" }, ".* TO \"", { "Ref" : "DBUsername" }, "\"@\"%\"\n",
+          "IDENTIFIED BY \"", { "Ref" : "DBPassword" }, "\";\n",
+          "FLUSH PRIVILEGES;\n",
+          "EXIT\n",
+          "EOF\n"
         ]]}}
       }
     },
 
-    "WikiDatabase": {
+    "DataVolume" : {
+      "Type" : "AWS::EC2::Volume",
+      "Properties" : {
+        "Size" : { "Ref" : "VolumeSize" },
+        "AvailabilityZone" : { "Fn::GetAtt" : [ "WikiDatabase", "AvailabilityZone" ]},
+        "Tags" : [{ "Key" : "Usage", "Value" : "Wiki Data Volume" }]
+      }
+    },
+
+    "WebServer": {
       "Type": "AWS::EC2::Instance",
+      "DependsOn": "WikiDatabase",
       "Metadata" : {
         "AWS::CloudFormation::Init" : {
           "config" : {
             "packages" : {
               "yum" : {
-                "mysql"        : [],
-                "mysql-server" : []
+                "httpd"        : [],
+                "wordpress"    : []
               }
             },
             "services" : {
               "systemd" : {
-                "mysqld"   : { "enabled" : "true", "ensureRunning" : "true" }
+                "httpd"    : { "enabled" : "true", "ensureRunning" : "true" }
               }
             }
           }
@@ -188,101 +191,25 @@
                           { "Fn::FindInMap" : [ "AWSInstanceType2Arch", { "Ref" : "InstanceType" }, "Arch" ] } ] },
         "InstanceType"   : { "Ref" : "InstanceType" },
         "KeyName"        : { "Ref" : "KeyName" },
-        "SecurityGroups" : [
-          {"Ref" : "AdminAccessSecurityGroup"},
-          {"Ref" : "MySQLSecurityGroup"}
-        ],
         "UserData"       : { "Fn::Base64" : { "Fn::Join" : ["", [
           "#!/bin/bash -v\n",
-          "# Wait for the EBS volume to show up\n",
-          "while [ ! -e /dev/sdh ]; do echo Waiting for EBS volume to attach; sleep 5; done\n",
-
-          "# Format the EBS volume and mount it\n",
-          "mkdir /var/wikidata\n",
-          "/sbin/mkfs -t ext3 /dev/sdh1\n",
-          "mount /dev/sdh1 /var/wikidata\n",
-
-          "# Initialize the wiki and fire up the server\n",
-          "cd /var/wikidata\n",
-          "touch /var/wikidata/hello\n",
-
-          "# Setup MySQL root password and create a user\n",
-          "mysqladmin -u root password '", { "Ref" : "DBRootPassword" }, "'\n",
-          "cat >> /tmp/mysql-wordpress-config << EOF\n",
-          "CREATE DATABASE ", { "Ref" : "DBName" }, ";\n",
-          "GRANT ALL PRIVILEGES ON ", { "Ref" : "DBName" }, ".* TO \"", { "Ref" : "DBUsername" }, "\"@\"localhost\"\n",
-          "IDENTIFIED BY \"", { "Ref" : "DBPassword" }, "\";\n",
-          "FLUSH PRIVILEGES;\n",
-          "EXIT\n",
-          "EOF\n",
-          "cat /tmp/mysql-wordpress-config | mysql -u root --password='", { "Ref" : "DBRootPassword" }, "' < /tmp/mysql-wordpress-config\n",
-          "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ /usr/share/wordpress/wp-config.php\n",
-          "cp /usr/share/wordpress/wp-config.php /usr/share/wordpress/wp-config.orig\n",
-
-          "# TODO: enable sql access from this IP:", { "Ref" : "WebServerIPAddress" }, "\n"
+          "/opt/aws/bin/cfn-init -f /var/lib/cloud/data/cfn-init-data\n",
+          "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ --e s/localhost/", { "Fn::GetAtt" : [ "WikiDatabase", "PublicIp" ]}, "/ /usr/share/wordpress/wp-config.php\n"
         ]]}}
       }
     },
 
-    "AdminAccessSecurityGroup" : {
-      "Type" : "AWS::EC2::SecurityGroup",
-      "Properties" : {
-        "GroupDescription" : "Enable ICMP and SSH",
-        "SecurityGroupIngress" : [
-          {"IpProtocol" : "icmp", "FromPort" : "-1", "ToPort" : "-1", "CidrIp" : "0.0.0.0/0"},
-          {"IpProtocol" : "tcp", "FromPort" : "22", "ToPort" : "22", "CidrIp" : "0.0.0.0/0"}
-        ]
-      }
-    },
-
-    "WebServerSecurityGroup" : {
-      "Type" : "AWS::EC2::SecurityGroup",
-      "Properties" : {
-        "GroupDescription" : "Enable HTTP access via port 80",
-        "SecurityGroupIngress" : [
-          {"IpProtocol" : "tcp", "FromPort" : "80", "ToPort" : "80", "CidrIp" : "0.0.0.0/0"}
-        ]
-      }
-    },
-
-    "MySQLSecurityGroup" : {
-      "Type" : "AWS::EC2::SecurityGroup",
-      "Properties" : {
-        "GroupDescription" : "Enable MySQL access via port 3306",
-        "SecurityGroupIngress" : [
-          {"IpProtocol" : "tcp", "FromPort" : "3306", "ToPort" : "3306", "CidrIp" : "0.0.0.0/0"}
-        ]
-      }
-    },
-
-    "DataVolume" : {
-      "Type" : "AWS::EC2::Volume",
-      "Properties" : {
-        "Size" : { "Ref" : "VolumeSize" },
-        "AvailabilityZone" : { "Fn::GetAtt" : [ "WikiDatabase", "AvailabilityZone" ]},
-        "Tags" : [{ "Key" : "Usage", "Value" : "Wiki Data Volume" }]
-      }
-    },
-
     "MountPoint" : {
       "Type" : "AWS::EC2::VolumeAttachment",
       "Properties" : {
         "InstanceId" : { "Ref" : "WikiDatabase" },
         "VolumeId"  : { "Ref" : "DataVolume" },
-        "Device" : "/dev/sdh"
+        "Device" : "/dev/vdb"
       }
     }
   },
 
   "Outputs" : {
-    "WebServerElasticIP" : {
-      "Value" : { "Ref" : "WebServerIPAddress" },
-      "Description" : "The Elastic IP Address of the Wordpress server."
-    },
-    "WikiDatabaseElasticIP" : {
-      "Value" : { "Ref" : "WikiDatabaseIPAddress" },
-      "Description" : "The Elastic IP Address of the MySQL server."
-    },
     "WebsiteURL" : {
       "Value" : { "Fn::Join" : ["", ["http://", { "Fn::GetAtt" : [ "WebServer", "PublicIp" ]}, "/wordpress"]] },
       "Description" : "URL for Wordpress wiki"