Merge pull request #70 from jtomasek/resetting-pending-user-input

Resetting pending user input
openshift-assisted · Jul 14, 2020 · 1f56a15 · 1f56a15
2 parents d58d3bc + b9a6b27
commit 1f56a15
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/src/api/swagger.yaml b/src/api/swagger.yaml
@@ -986,6 +986,7 @@ definitions:
           - installing
           - installing-in-progress
           - installing-pending-user-action
+          - resetting-pending-user-action
           - installed
           - error
           - resetting

diff --git a/src/api/types.ts b/src/api/types.ts
@@ -331,6 +331,7 @@ export interface Host {
     | 'installing'
     | 'installing-in-progress'
     | 'installing-pending-user-action'
+    | 'resetting-pending-user-action'
     | 'installed'
     | 'error'
     | 'resetting';

diff --git a/src/components/clusterConfiguration/NetworkConfiguration.tsx b/src/components/clusterConfiguration/NetworkConfiguration.tsx
@@ -32,7 +32,8 @@ const NetworkConfiguration: React.FC<NetworkConfigurationProps> = ({
   const baseDnsHelperText = (
     <>
       The base domain of the cluster. All DNS records must be sub-domains of this base and include
-      the cluster name. This cannot be changed after cluster installation. The full cluster address will be:{' '}
+      the cluster name. This cannot be changed after cluster installation. The full cluster address
+      will be:{' '}
       <strong>
         {clusterName || '[Cluster Name]'}.{baseDnsDomain || '[example.com]'}
       </strong>

diff --git a/src/components/hosts/HostStatus.tsx b/src/components/hosts/HostStatus.tsx
@@ -37,6 +37,8 @@ const getStatusIcon = (status: Host['status']) => {
   if (status === 'error') return <ExclamationCircleIcon color={dangerColor.value} />;
   if (status === 'installed') return <CheckCircleIcon color={okColor.value} />;
   if (status === 'resetting') return <InProgressIcon />;
+  if (status === 'resetting-pending-user-action')
+    return <WarningTriangleIcon color={warningColor.value} />;
   return <UnknownIcon />;
 };
 

diff --git a/src/config/constants.ts b/src/config/constants.ts
@@ -40,12 +40,13 @@ export const HOST_STATUS_LABELS: { [key in Host['status']]: string } = {
   disconnected: 'Disconnected',
   insufficient: 'Insufficient',
   disabled: 'Disabled',
-  installing: 'Starting Installation',
+  installing: 'Starting installation',
   'installing-in-progress': 'Installing',
-  'installing-pending-user-action': 'Incorrect Boot Order',
+  'installing-pending-user-action': 'Incorrect boot order',
   installed: 'Installed',
   error: 'Error',
   resetting: 'Resetting',
+  'resetting-pending-user-action': 'Reboot required',
 };
 
 export const CLUSTER_FIELD_LABELS: { [key in string]: string } = {
@@ -78,4 +79,6 @@ export const HOST_STATUS_DETAILS: { [key in Host['status']]: string } = {
   installed: 'This host completed its installation successfully.',
   error: 'This host failed its installation.',
   resetting: 'This host is resetting the installation.',
+  'resetting-pending-user-action':
+    'Host already booted from disk during previous installation. To finish resetting the installation please boot the host into Discovery ISO.',
 };