--- a/components/openstack/horizon/files/overrides.py	Tue Dec 15 00:08:40 2015 -0800
+++ b/components/openstack/horizon/files/overrides.py	Tue Dec 15 00:08:40 2015 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -16,6 +16,8 @@
 Solaris-specific customizations for Horizon
 """
 
+from openstack_dashboard.dashboards.admin.instances.forms import \
+    LiveMigrateForm
 from openstack_dashboard.dashboards.admin.instances import tables \
     as admin_tables
 from openstack_dashboard.dashboards.admin.networks.forms import CreateNetwork
@@ -29,17 +31,12 @@
     DeleteNetwork, NetworksTable
 from openstack_dashboard.dashboards.project.access_and_security.tabs import \
     AccessAndSecurityTabs, APIAccessTab, FloatingIPsTab, KeypairsTab
-from \
-    openstack_dashboard.dashboards.project.images.images.tables \
-    import EditImage, DeleteImage, ImagesTable, LaunchImage
+from openstack_dashboard.dashboards.project.images.images.tables import \
+    EditImage, DeleteImage, ImagesTable, LaunchImage
 from openstack_dashboard.dashboards.project.instances import tables \
     as project_tables
-from openstack_dashboard.dashboards.project.instances.tabs import \
-    InstanceDetailTabs, LogTab, OverviewTab
 from openstack_dashboard.dashboards.project.instances.workflows import \
-    create_instance
-from openstack_dashboard.dashboards.project.instances.workflows import \
-    update_instance
+    create_instance, update_instance
 from openstack_dashboard.dashboards.project.networks.ports.tables import \
     PortsTable as projectPortsTable
 from openstack_dashboard.dashboards.project.networks.subnets.tables import \
@@ -54,10 +51,9 @@
     NetworksTable as projectNetworksTable
 from openstack_dashboard.dashboards.project.networks.workflows import \
     CreateNetworkInfoAction, CreateSubnetDetailAction, CreateSubnetInfoAction
-from openstack_dashboard.dashboards.project.stacks.tabs import \
-    StackDetailTabs, StackEventsTab, StackOverviewTab, StackResourcesTab
 
-# Remove 'PostCreationStep' from Project/Instances/Launch Instance
+# Remove 'PostCreationStep', 'SetAdvanced' from
+# Project/Compute/Instances/Launch Instance
 create_instance.LaunchInstance.default_steps = (
     create_instance.SelectProjectUser,
     create_instance.SetInstanceDetails,
@@ -66,29 +62,30 @@
 )
 
 # Remove 'UpdateInstanceSecurityGroups' from
-# Project/Instances/Actions/Edit Instance
+# Project/Compute/Instances/Actions/Edit Instance
 update_instance.UpdateInstance.default_steps = (
     update_instance.UpdateInstanceInfo,
 )
 
-# Remove 'SecurityGroupsTab' tab from Project/Access & Security
+# Remove 'SecurityGroupsTab' tab from Project/Compute/Access & Security
 AccessAndSecurityTabs.tabs = (KeypairsTab, FloatingIPsTab, APIAccessTab)
 
-# Remove 'ConfirmResize', 'RevertResize', 'TogglePause',
-# 'ToggleSuspend', 'MigrateInstance' actions from Admin/Instances/Actions
+# Remove 'ConfirmResize', 'RevertResize', 'TogglePause', 'ToggleSuspend',
+# 'MigrateInstance' actions from Admin/System/Instances/Actions
 admin_tables.AdminInstancesTable._meta.row_actions = (
     admin_tables.AdminEditInstance,
     project_tables.ConsoleLink,
     project_tables.LogLink,
     project_tables.CreateSnapshot,
+    admin_tables.LiveMigrateInstance,
     project_tables.SoftRebootInstance,
     project_tables.RebootInstance,
     project_tables.TerminateInstance
 )
 
-# Remove 'ConfirmResize', 'RevertResize', 'EditInstanceSecurityGroups',
-# 'TogglePause', 'ToggleSuspend', 'ResizeLink', 'RebuildInstance' actions
-# from Project/Instances/Actions
+# Remove 'ConfirmResize', 'RevertResize', 'DecryptInstancePassword',
+# 'EditInstanceSecurityGroups', 'TogglePause', 'ToggleSuspend', 'ResizeLink',
+# 'RebuildInstance' actions from Project/Compute/Instances/Actions
 project_tables.InstancesTable._meta.row_actions = (
     project_tables.StartInstance,
     project_tables.CreateSnapshot,
@@ -104,41 +101,49 @@
     project_tables.TerminateInstance
 )
 
-# Disable 'admin_state' in Admin/Networks/Create Network
+# Disable 'disk_over_commit', 'block_migration' in
+# Admin/System/Instances/Actions/Live Migrate Instance. Note that this is
+# unchecked by default.
+LiveMigrateForm.base_fields['disk_over_commit'].widget.attrs['disabled'] = True
+LiveMigrateForm.base_fields['block_migration'].widget.attrs['disabled'] = True
+
+# Disable 'admin_state' in Admin/System/Networks/Create Network
 admin_state = CreateNetwork.base_fields['admin_state']
 admin_state.widget.attrs['disabled'] = True
 admin_state.widget.value_from_datadict = lambda *args: True
 
-# Disable 'shared' in Admin/Networks/Create Network. Note that this
-# is unchecked by default.
+# Disable 'shared' in Admin/System/Networks/Create Network. Note that this is
+# unchecked by default.
 CreateNetwork.base_fields['shared'].widget.attrs['disabled'] = True
 
-# Disable 'admin_state' in Admin/Networks/Network Name/Create Port
+# Disable 'admin_state' in Admin/System/Networks/Network Name/Create Port
 admin_state = CreatePort.base_fields['admin_state']
 admin_state.widget.attrs['disabled'] = True
 admin_state.widget.value_from_datadict = lambda *args: True
 
-# Remove 'UpdatePort' action from Admin/Networks/Network Name/Actions
+# Remove 'UpdatePort' action from Admin/System/Networks/Network Name/Actions
 PortsTable._meta.row_actions = (DeletePort,)
 
-# Remove 'UpdateSubnet' action from Admin/Networks/Network Name/Actions
+# Remove 'UpdateSubnet' action from
+# Admin/System/Networks/Network Name/Subnets/Actions
 SubnetsTable._meta.row_actions = (DeleteSubnet,)
 
-# Remove the 'EditNetwork' action from Admin/Networks/Actions
+# Remove the 'EditNetwork' action from Admin/System/Networks/Actions
 NetworksTable._meta.row_actions = (DeleteNetwork,)
 
-# Remove the 'UpdatePort' action from Project/Networks/Name/Ports/Actions
+# Remove the 'UpdatePort' action from
+# Project/Network/Networks/Name/Ports/Actions
 projectPortsTable._meta.row_actions = ()
 
 # Remove the 'UpdateSubnet' action from
-# Project/Networks/Name/Subnets/Actions
+# Project/Network/Networks/Name/Subnets/Actions
 projectSubnetsTable._meta.row_actions = (projectDeleteSubnet,)
 
-# Remove the 'EditNetwork' action from Project/Networks/Actions
+# Remove the 'EditNetwork' action from Project/Network/Networks/Actions
 projectNetworksTable._meta.row_actions = (projectCreateSubnet,
                                           projectDeleteNetwork)
 
-# Disable 'admin_state' in Project/Networks/Create Network/Network
+# Disable 'admin_state' in Project/Network/Networks/Create Network/Network
 admin_state = CreateNetworkInfoAction.base_fields['admin_state']
 admin_state.widget.attrs['disabled'] = True
 admin_state.widget.value_from_datadict = lambda *args: True
@@ -148,11 +153,10 @@
 CreateSubnetInfoAction.base_fields['no_gateway'].widget.attrs['disabled'] = \
     True
 
-# Remove 'CreateVolumeFromImage' checkbox from
-# Project/Images & Snapshots/Actions
+# Remove 'CreateVolumeFromImage' checkbox from Project/Compute/Images/Actions
 ImagesTable._meta.row_actions = (LaunchImage, EditImage, DeleteImage,)
 
 # Change 'host_routes' field to read-only in
-# Project/Networks/Create Network/Subnet Detail
+# Project/Network/Networks/Create Network/Subnet Detail
 base_fields = CreateSubnetDetailAction.base_fields
 base_fields['host_routes'].widget.attrs['readonly'] = 'readonly'