Shahar Havivi has uploaded a new change for review. Change subject: Engine: Enable Cloud-Init SSH login via public key ......................................................................
Engine: Enable Cloud-Init SSH login via public key Fixes: 1. Root is able to login via public key and password 2. Root password is not expired, i.e. no need to change password first login (only if password was set) Change-Id: Idb48fe4306f803aca801c03ddf29f010eaeb635f 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, 15 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/25625/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..32770b2 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 @@ -119,7 +119,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"); } @@ -211,10 +211,20 @@ output.put("all", ">> /var/log/cloud-init-output.log"); userData.put("output", output); - // Disable metadata-server-based datasources to prevent long boot times - List<String> runcmd = new ArrayList<String>(); - runcmd.add("sed -i '/^datasource_list: /d' /etc/cloud/cloud.cfg; echo 'datasource_list: [\"NoCloud\", \"ConfigDrive\"]' >> /etc/cloud/cloud.cfg"); - userData.put("runcmd", runcmd); + + List<String> bootcmd = new ArrayList<String>(); + // set disable_root=0 for enabling root ssh login and + // datasource_list in cloud.cfg + bootcmd.add("sed -i '/^disable_root: /d' /etc/cloud/cloud.cfg"); + bootcmd.add("echo 'disable_root: 0' >> /etc/cloud/cloud.cfg"); + bootcmd.add("sed -i '/^datasource_list: /d' /etc/cloud/cloud.cfg"); + bootcmd.add("echo 'datasource_list: [\"NoCloud\", \"ConfigDrive\"]' >> /etc/cloud/cloud.cfg"); + userData.put("bootcmd", bootcmd); + + Map<String, Object> opts = new HashMap<String, Object>(); + opts.put("expire", false); + userData.put("chpasswd", opts); + userData.put("ssh_pwauth", true); } -- To view, visit http://gerrit.ovirt.org/25625 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb48fe4306f803aca801c03ddf29f010eaeb635f 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
