Merge pull request #105 from benbp/redhat-ssh-validation-1.2

Add SSH validation to RHEL install graph
RackHD · May 24, 2016 · ce462c1 · ce462c1
2 parents 3c14dfc + df2bf90
commit ce462c1
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/lib/graphs/install-rhel-graph.js b/lib/graphs/install-rhel-graph.js
@@ -7,13 +7,24 @@ module.exports = {
     injectableName: 'Graph.InstallRHEL',
     options: {
         defaults: {
+            // Make sure this matches for both the install-os task and the
+            // rackhd-callback-uri-wait task, so put it in "defaults"
+            completionUri: 'renasar-ansible.pub',
             version: null,
             repo: '{{api.server}}/rhel/{{options.version}}/os/x86_64'
         },
         'install-os': {
             schedulerOverrides: {
                 timeout: 3600000 //1 hour
             }
+        },
+        'rackhd-callback-uri-wait': {
+            schedulerOverrides: {
+                timeout: 1200000 // 20 minutes
+            }
+        },
+        'validate-ssh': {
+            retries: 10
         }
     },
     tasks: [
@@ -35,6 +46,20 @@ module.exports = {
             waitOn: {
                 'reboot': 'succeeded'
             }
+        },
+        {
+            label: 'rackhd-callback-uri-wait',
+            taskName: 'Task.Wait.Completion.Uri',
+            waitOn: {
+                'install-os': 'succeeded'
+            }
+        },
+        {
+            label: 'validate-ssh',
+            taskName: 'Task.Ssh.Validation',
+            waitOn: {
+                'rackhd-callback-uri-wait': 'succeeded'
+            }
         }
     ]
 };