Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: rename
ENGINE_SSH_PUBLIC_KEY_VALUE->ENGINE_SSH_PUBLIC_KEY
......................................................................
packaging: setup: rename ENGINE_SSH_PUBLIC_KEY_VALUE->ENGINE_SSH_PUBLIC_KEY
all is values... no need to specify that within variable name.
Change-Id: Iadb7696422583545a627aa8756773225a12904c0
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/constants.py
M packaging/setup/plugins/ovirt-engine-setup/all-in-one/sshd.py
M packaging/setup/plugins/ovirt-engine-setup/pki/ssh.py
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/18437/1
diff --git a/packaging/setup/ovirt_engine_setup/constants.py
b/packaging/setup/ovirt_engine_setup/constants.py
index a5fe44b..7204f62 100644
--- a/packaging/setup/ovirt_engine_setup/constants.py
+++ b/packaging/setup/ovirt_engine_setup/constants.py
@@ -792,7 +792,7 @@
def ORG(self):
return 'OVESETUP_PKI/organization'
- ENGINE_SSH_PUBLIC_KEY_VALUE = 'OVESETUP_PKI/sshPublicKey'
+ ENGINE_SSH_PUBLIC_KEY = 'OVESETUP_PKI/sshPublicKey'
@util.export
diff --git a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/sshd.py
b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/sshd.py
index cdd16ab..fa7b52c 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/all-in-one/sshd.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/all-in-one/sshd.py
@@ -112,7 +112,7 @@
)
def _misc(self):
authorized_keys_line = self.environment[
- osetupcons.PKIEnv.ENGINE_SSH_PUBLIC_KEY_VALUE
+ osetupcons.PKIEnv.ENGINE_SSH_PUBLIC_KEY
] + ' ovirt-engine'
authorized_keys_file = os.path.join(
diff --git a/packaging/setup/plugins/ovirt-engine-setup/pki/ssh.py
b/packaging/setup/plugins/ovirt-engine-setup/pki/ssh.py
index 1b0f373..709d501 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/pki/ssh.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/pki/ssh.py
@@ -98,7 +98,7 @@
stdin=pubkey,
)
self.environment[
- osetupcons.PKIEnv.ENGINE_SSH_PUBLIC_KEY_VALUE
+ osetupcons.PKIEnv.ENGINE_SSH_PUBLIC_KEY
] = sshpubkey[0]
@plugin.event(
@@ -118,7 +118,7 @@
with open(temp, "w") as f:
f.write(
self.environment[
- osetupcons.PKIEnv.ENGINE_SSH_PUBLIC_KEY_VALUE
+ osetupcons.PKIEnv.ENGINE_SSH_PUBLIC_KEY
]
)
f.write('\n')
--
To view, visit http://gerrit.ovirt.org/18437
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadb7696422583545a627aa8756773225a12904c0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
