Ravi Nori has uploaded a new change for review.

Change subject: webadmin: ovirt-node reinstall/approve should use root user
......................................................................

webadmin: ovirt-node reinstall/approve should use root user

While admin is local node user that should not be
used remotely when upgrading or reinstalling oVirt
Node.

Change-Id: Ia85bf1cfb96513f22629d9cb8fb3028c4446b5d2
Bug-Url: https://bugzilla.redhat.com/1080976
Signed-off-by: Ravi Nori <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
2 files changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/26251/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
index 528dd59..508f92b 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
@@ -1272,9 +1272,6 @@
     public void install()
     {
         final VDS host = (VDS) getSelectedItem();
-        if (host.getVdsType() == VDSType.oVirtNode) {
-            host.setSshUsername(HostModel.AdminUserName);
-        }
         InstallModel model = new InstallModel();
         model.setVds(host);
         setWindow(model);
@@ -1371,7 +1368,6 @@
     public void upgrade()
     {
         final VDS host = (VDS) getSelectedItem();
-        host.setSshUsername(HostModel.AdminUserName);
         InstallModel model = new InstallModel();
         model.setVds(host);
         setWindow(model);
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
index 45a9b3b..928c581 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
@@ -58,7 +58,6 @@
     public static final String PmSlotKey = "slot"; //$NON-NLS-1$
     public static final String BeginTestStage = "BeginTest"; //$NON-NLS-1$
     public static final String EndTestStage = "EndTest"; //$NON-NLS-1$
-    public static final String AdminUserName = "admin"; //$NON-NLS-1$
     public static final String RootUserName = "root"; //$NON-NLS-1$
 
     private UICommand privateTestCommand;


-- 
To view, visit http://gerrit.ovirt.org/26251
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia85bf1cfb96513f22629d9cb8fb3028c4446b5d2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ravi Nori <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to