Shahar Havivi has uploaded a new change for review. Change subject: engine: SSH ......................................................................
engine: SSH Change-Id: Idf23b61003ba4c5b852019fec472a130d8c6dc68 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/25340/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java index 0dc4034..f27d441 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java @@ -105,6 +105,7 @@ private void storeAuthorizedKeys() { if (!StringUtils.isEmpty(vmInit.getAuthorizedKeys())) { metaData.put("public_keys", normalizeAuthorizedKeys(vmInit.getAuthorizedKeys())); + metaData.put("lock_passwd", false); } } @@ -119,7 +120,7 @@ } private void storeRegenerateKeys() { - if (vmInit.getRegenerateKeys() != null && (boolean) vmInit.getRegenerateKeys()) { + if (vmInit.getRegenerateKeys() != null && vmInit.getRegenerateKeys()) { // Create new system ssh keys userData.put("ssh_deletekeys", "True"); } @@ -183,6 +184,7 @@ if (!StringUtils.isEmpty(vmInit.getRootPassword())) { // Note that this is in plain text in the config disk userData.put(passwordKey, vmInit.getRootPassword()); + userData.put("lock-passwd", false); } } -- To view, visit http://gerrit.ovirt.org/25340 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf23b61003ba4c5b852019fec472a130d8c6dc68 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
