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 <shah...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/26246/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 8d5cf4a..ed1507d 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");
}
@@ -205,6 +205,7 @@
// Don't create ec2-user
userData.put("user", "root");
+ userData.put("disable_root", 0);
// Redirect log output from cloud-init execution from terminal
Map<String, String> output = new HashMap<String, String>();
@@ -215,6 +216,11 @@
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);
+
+ 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/26246
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb48fe4306f803aca801c03ddf29f010eaeb635f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Shahar Havivi <shav...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
