Merge pull request #216 from pengz1/Update-secure-erase-graph

Update secure erase graph
RackHD · Feb 28, 2017 · c69028e · c69028e
2 parents 0afdb92 + 7a730bc
commit c69028e
Showing 1 changed file with 38 additions and 7 deletions.
diff --git a/lib/graphs/secure-erase-drive-graph.js b/lib/graphs/secure-erase-drive-graph.js
@@ -7,21 +7,31 @@ module.exports = {
     injectableName: 'Graph.Drive.SecureErase',
     options: {
         'bootstrap-ubuntu': {
-            overlayfsFile: "secure.erase.overlay.cpio.gz",
+            overlayfsFile: 'secure.erase.overlay.cpio.gz',
             triggerGroup: 'secureErase'
         },
         'drive-secure-erase': {
             eraseSettings: null
         },
+        'drive-scan-delay': {
+            duration: 10000
+        },
         'finish-bootstrap-trigger': {
             triggerGroup: 'secureErase'
         }
     },
     tasks: [
+        {
+            label: 'cache-driveId-catalog',
+            taskName: 'Task.Get.DriveId.Catalog',
+        },
         {
             label: 'set-boot-pxe',
             taskName: 'Task.Obm.Node.PxeBoot',
-            ignoreFailure: true
+            ignoreFailure: true,
+            waitOn: {
+                'cache-driveId-catalog': 'succeeded'
+            }
         },
         {
             label: 'reboot',
@@ -37,34 +47,55 @@ module.exports = {
                 'reboot': 'succeeded'
             }
         },
+        {
+            label: 'drive-scan-delay',
+            taskName: 'Task.Node.Sleep',
+            waitOn: {
+                'reboot': 'succeeded'
+            }
+        },
+        {
+            label: 'catalog-driveid-before',
+            taskName: 'Task.Catalog.Drive.Id',
+            waitOn: {
+                'drive-scan-delay': 'succeeded'
+            }
+        },
+        {
+            label: 'catalog-megaraid-before',
+            taskName: 'Task.Catalog.megaraid',
+            waitOn: {
+                'catalog-driveid-before': 'succeeded'
+            }
+        },
         {
             label: 'drive-secure-erase',
             taskName: 'Task.Drive.SecureErase',
             waitOn: {
-                'reboot': 'succeeded'
+                'catalog-megaraid-before': 'succeeded'
             }
         },
         {
-            label: 'catalog-megaraid',
+            label: 'catalog-megaraid-after',
             taskName: 'Task.Catalog.megaraid',
             waitOn: {
                 'drive-secure-erase': 'succeeded'
             },
             ignoreFailure: true
         },
         {
-            label: 'catalog-driveid',
+            label: 'catalog-driveid-after',
             taskName: 'Task.Catalog.Drive.Id',
             waitOn: {
-                'catalog-megaraid': 'finished'
+                'catalog-megaraid-after': 'finished'
             },
             ignoreFailure: true
         },
         {
             label: 'shell-reboot',
             taskName: 'Task.ProcShellReboot',
             waitOn: {
-                'catalog-driveid': 'finished'
+                'catalog-driveid-after': 'finished'
             }
         },
         {