heat template : Align two Openshift template varieties

Align the build-from-scratch Openshift.template with the
now-working OpenShift_Prebuilt_JEOS.template

Change-Id: I8d164b0837b4cb28a6ce4ad1573b19f8daf68b8a
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/templates/OpenShift.template b/templates/OpenShift.template
index 9f697f10e6e32020f37b77c189bd172fddba9d78..0448322161f7a25ada07641caa5caf64d5fc43a9 100644 (file)
--- a/templates/OpenShift.template
+++ b/templates/OpenShift.template
@@ -1,7 +1,7 @@
 {
   "AWSTemplateFormatVersion" : "2010-09-09",
 
-  "Description" : "OpenShift Broker Template.",
+  "Description" : "OpenShift Broker/Node Template.",
 
   "Parameters" : {
 
@@ -116,7 +116,17 @@
           "cd /home/builder/crankcase/build ; rake devbroker || error_exit failed_devbroker\n",
           "ss-setup-broker\n",
           "hostname\n",
-          "ss-register-dns --with-node-hostname node0 --with-node-ip ", { "Fn::GetAtt" : [ "OpenShiftNodeServer", "PublicIp" ]}, "\n"
+          "ss-register-dns --with-node-hostname node0 --with-node-ip ", { "Fn::GetAtt" : [ "OpenShiftNodeServer", "PublicIp" ]}, "\n",
+
+          "echo 'Creating example openshift application'\n",
+          "export USER='root'\n",
+          "export HOME='/root'\n",
+          "echo 'StrictHostKeyChecking no' >> /etc/ssh/ssh_config\n",
+          "yes | rhc domain create -l admin -p admin -n admin\n",
+          "rhc app create -l admin -p admin -t php-5.3 -a hello\n",
+
+          "# All is well so signal success\n",
+          "/opt/aws/bin/cfn-signal -e 0 -r \"OpenShift setup complete\" '", { "Ref" : "WaitHandle" }, "'\n"
 
         ]]}}
       }
@@ -124,7 +134,6 @@
 
     "OpenShiftNodeServer": {
       "Type": "AWS::EC2::Instance",
-      "DependsOn": "OpenShiftBrokerServer",
       "Metadata" : {
         "AWS::CloudFormation::Init" : {
           "config" : {
@@ -179,12 +188,8 @@
           "cd /home/builder/crankcase/build ; rake build_setup || error_exit failed_build_setup\n",
           "cd /home/builder/crankcase/build ; rake build || error_exit failed_build\n",
           "cd /home/builder/crankcase/build ; rake devnode || error_exit failed_devnode\n",
-          "ss-setup-node --with-broker-ip ", { "Fn::GetAtt" : [ "OpenShiftBrokerServer", "PublicIp" ]}, " --with-node-hostname node0\n",
-          "echo 'Testing connection to broker'\n",
-          "curl -k https://broker.example.com/broker/rest/api",
+          "ss-setup-node --with-broker-ip ", { "Fn::GetAtt" : [ "OpenShiftBrokerServer", "PublicIp" ]}, " --with-node-hostname node0\n"
 
-          "# All is well so signal success\n",
-          "/opt/aws/bin/cfn-signal -e 0 -r \"OpenShift setup complete\" '", { "Ref" : "WaitHandle" }, "'\n"
         ]]}}
       }
     },
@@ -195,7 +200,7 @@
 
     "WaitCondition" : {
       "Type" : "AWS::CloudFormation::WaitCondition",
-      "DependsOn" : "OpenShiftNodeServer",
+      "DependsOn" : "OpenShiftBrokerServer",
       "Properties" : {
         "Handle" : {"Ref" : "WaitHandle"},
         "Timeout" : "3000"