Simone Tiraboschi has uploaded a new change for review.
Change subject: packaging: setup: fixing development environment on remote
engine
......................................................................
packaging: setup: fixing development environment on remote engine
Fixing imports for
notroot developing environment.
Change-Id: I9b7e75dbf8ffe7a8c251232648685b0d6dbf592b
Signed-off-by: Simone Tiraboschi <stira...@redhat.com>
(cherry picked from commit f49535ce74f84d65057e25cd6dd52015c1e78be6)
---
M
packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py
1 file changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/34442/1
diff --git
a/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py
b/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py
index ce3c127..964b31d 100644
---
a/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py
+++
b/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py
@@ -17,7 +17,6 @@
import socket
-import paramiko
import time
import gettext
_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup')
@@ -66,6 +65,7 @@
return _('Access remote engine server using ssh as root')
def _ssh_get_port(self):
+ import paramiko
port_valid = False
key = osetupcons.ConfigEnv.REMOTE_ENGINE_HOST_SSH_PORT
port = self.environment[key]
@@ -114,6 +114,7 @@
raise RuntimeError(msg)
def _ssh_connect(self):
+ import paramiko
connected = False
interactive = False
password = self.environment[
@@ -281,13 +282,16 @@
priority=plugin.Stages.PRIORITY_HIGH,
)
def _setup(self):
- self.environment[
- osetupcons.ConfigEnv.REMOTE_ENGINE_SETUP_STYLES
- ].append(
- self._RootSshManager(
- plugin=self,
+ if not self.environment[
+ osetupcons.CoreEnv.DEVELOPER_MODE
+ ]:
+ self.environment[
+ osetupcons.ConfigEnv.REMOTE_ENGINE_SETUP_STYLES
+ ].append(
+ self._RootSshManager(
+ plugin=self,
+ )
)
- )
# vim: expandtab tabstop=4 shiftwidth=4
--
To view, visit http://gerrit.ovirt.org/34442
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b7e75dbf8ffe7a8c251232648685b0d6dbf592b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Simone Tiraboschi <stira...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
