diff --git a/data/templates/sasraid-config.sh b/data/templates/sasraid-config.sh new file mode 100644 index 000000000..ce1ba4ca5 --- /dev/null +++ b/data/templates/sasraid-config.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Copyright 2017, Dell EMC, Inc. + +hddArr=<%- JSON.stringify(hddArr) || [] %> +ssdStoragePoolArr=<%- JSON.stringify(ssdStoragePoolArr) || [] %> +ssdCacheCadeArr=<%- JSON.stringify(ssdCacheCadeArr) || [] %> +path=<%=path%> +controller=<%=controller%> + +echo hddArr is: $hddArr +echo ssdStoragePoolArr is: $ssdStoragePoolArr +echo ssdCacheCadeArr is: $ssdCacheCadeArr +echo path is: $path +echo controller is: $controller + +function create_vd_for_hdd() +{ + echo "Creating Virtual Disks For Hard Drives" + <% hddArr.forEach(function (value){ %> + convertedDrivesList=(<%=value.drives.replace(/[[\],]/g,' ')%>) + drives="" + for i in "${convertedDrivesList[@]}" + do + drives="${drives} <%=value.enclosure%>:$i" + done + + echo running: $path $controller create <%=value.type%> MAX ${drives} <%=value.name%> noprompt + $path $controller create <%=value.type%> MAX ${drives} <%=value.name%> noprompt + <% }); %> + echo "Done Creating Virtual Disks For Hard Drives" +} + +function delete() +{ + echo "Deleting $controller Virtual Disks" + echo running: $path $controller delete noprompt + $path $controller delete noprompt + echo "Done Deleting Virtual Disks" +} + +delete +create_vd_for_hdd diff --git a/lib/graphs/bootstrap-megaraid-config-graph.js b/lib/graphs/bootstrap-megaraid-config-graph.js index 00dc0284f..16f273526 100644 --- a/lib/graphs/bootstrap-megaraid-config-graph.js +++ b/lib/graphs/bootstrap-megaraid-config-graph.js @@ -15,6 +15,7 @@ module.exports = { ssdStoragePoolArr:null, ssdCacheCadeArr:null, path:null, + script:null, controller:null } }, diff --git a/lib/graphs/discovery-graph.js b/lib/graphs/discovery-graph.js index 587026f0e..06a605170 100755 --- a/lib/graphs/discovery-graph.js +++ b/lib/graphs/discovery-graph.js @@ -65,11 +65,27 @@ module.exports = { }, ignoreFailure: true }, + { + label: 'catalog-perccli', + taskName: 'Task.Catalog.perccli', + waitOn: { + 'catalog-megaraid': 'finished' + }, + ignoreFailure: true + }, + { + label: 'catalog-sasraid', + taskName: 'Task.Catalog.sasraid', + waitOn: { + 'catalog-perccli': 'finished' + }, + ignoreFailure: true + }, { label: 'catalog-smart', taskName: 'Task.Catalog.smart', waitOn: { - 'catalog-megaraid': 'finished' + 'catalog-sasraid': 'finished' }, ignoreFailure: true }, diff --git a/lib/graphs/rancher-discovery-graph.js b/lib/graphs/rancher-discovery-graph.js index 4d8dd9efc..cc9f5d9ae 100755 --- a/lib/graphs/rancher-discovery-graph.js +++ b/lib/graphs/rancher-discovery-graph.js @@ -73,11 +73,19 @@ module.exports = { }, ignoreFailure: true }, + { + label: 'catalog-sasraid', + taskName: 'Task.Catalog.sasraid', + waitOn: { + 'catalog-perccli': 'finished' + }, + ignoreFailure: true + }, { label: 'catalog-smart', taskName: 'Task.Catalog.smart', waitOn: { - 'catalog-perccli': 'finished' + 'catalog-sasraid': 'finished' }, ignoreFailure: true },