Activate image and reboot host
When activating a host image, gives the option to:
a) Activate image without booting
b) Activate image and boot host. If server is
in 'off' status the option is to power on.
If the server is in 'unavailable', 'on', or
'error' status the option is to reboot
Also updated polling during boot and reboot to use
/subscribe API.
Resolves openbmc/openbmc#3323
Tested: The GUI displays the options and boots /
reboots appropriately based on server status.
Change-Id: I62c19e094ecc7112263c26844fcd30b2bf3c2b84
Signed-off-by: beccabroek <rebecca.shaw@ibm.com>
diff --git a/app/configuration/controllers/firmware-controller.html b/app/configuration/controllers/firmware-controller.html
index 4d3e2a3..e79913b 100644
--- a/app/configuration/controllers/firmware-controller.html
+++ b/app/configuration/controllers/firmware-controller.html
@@ -120,7 +120,7 @@
<div class="modal__content">
<div ng-switch on="activate_image_type">
<p ng-switch-when="BMC">When you activate the BMC firmware file, {{activate_image_version}}, the BMC must be rebooted before it will operate with the new firmware code. Note that when you reboot the BMC, the BMC will be unavailable for several minutes and you must log in again.</p>
- <p ng-switch-when="Host">When you activate server firmware file, {{activate_image_version}}, the new firmware will not operate until the next time the server boots.</p>
+ <p ng-switch-when="Host">When you activate the server firmware file, {{activate_image_version}}, the new firmware will not operate until the next time the server boots.</p>
</div>
<form ng-if="activate_image_type == 'BMC'">
<fieldset>
@@ -138,6 +138,22 @@
</div>
</fieldset>
</form>
+ <form ng-if="activate_image_type == 'Host'">
+ <fieldset>
+ <div class="row column">
+ <label class="control-radio bold" for="activate-host-without-reboot">Activate firmware file without {{isServerOff() ? "booting" : "rebooting"}} server
+ <input type="radio" name="activate-host-without-reboot" id="activate-host-without-reboot" ng-model="activate.reboot" ng-value="false"/>
+ <span class="control__indicator control__indicator-on"></span>
+ </label>
+ </div>
+ <div class="row column">
+ <label class="control-radio bold" for="activate-host-with-reboot">Activate firmware file and automatically {{isServerOff() ? "boot" : "reboot"}} server
+ <input type="radio" name="activate-host-with-reboot" id="activate-host-with-reboot" ng-model="activate.reboot" ng-value="true"/>
+ <span class="control__indicator control__indicator-on"></span>
+ </label>
+ </div>
+ </fieldset>
+ </form>
</div>
<div class="modal__button-wrapper">
<button class="inline btn-secondary" ng-click="activate_confirm=false;">Cancel</button>