From: Steven Dake <sdake@redhat.com>
Date: Mon, 2 Apr 2012 02:15:21 +0000 (-0700)
Subject: Make wordpress template leave mysql+http running, and start/enable them by default
X-Git-Tag: 2014.1~2108
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=db5b63733e81e934b5cb2be1455bef7948015b4e;p=openstack-build%2Fheat-build.git

Make wordpress template leave mysql+http running, and start/enable them by default

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

diff --git a/templates/WordPress_Single_Instance.template b/templates/WordPress_Single_Instance.template
index 69d9b113..9e6f8f2f 100644
--- a/templates/WordPress_Single_Instance.template
+++ b/templates/WordPress_Single_Instance.template
@@ -108,8 +108,8 @@
             },
             "services" : {
               "systemd" : {
-                "httpd"    : { "enabled" : "false", "ensureRunning" : "false" },
-                "mysqld"   : { "enabled" : "false", "ensureRunning" : "false" }
+                "httpd"    : { "enabled" : "true", "ensureRunning" : "true" },
+                "mysqld"   : { "enabled" : "true", "ensureRunning" : "true" }
               }
             }
           }
@@ -122,8 +122,6 @@
         "KeyName"        : { "Ref" : "KeyName" },
         "UserData"       : { "Fn::Base64" : { "Fn::Join" : ["", [
           "#!/bin/bash -v\n",
-
-          "systemctl start mysqld.service\n",
           "# Setup MySQL root password and create a user\n",
           "mysqladmin -u root password '", { "Ref" : "DBRootPassword" }, "'\n",
           "cat >> /tmp/mysql-wordpress-config << EOF\n",
@@ -134,7 +132,6 @@
           "EXIT\n",
           "EOF\n",
           "cat /tmp/mysql-wordpress-config | mysql -u root --password='", { "Ref" : "DBRootPassword" }, "' < /tmp/mysql-wordpress-config\n",
-          "systemctl stop mysqld.service\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"
         ]]}}