Skip to content

Commit 6ed8392

Browse files
committed
core: fix boolean values in CloudInit
disable_root and ssh_deletekeys should be booleans instead of 0/string. This gives a schema error in cloud-init otherwise. Fixes: #889 Signed-off-by: Jean-Louis Dupond <[email protected]>
1 parent 0f394bf commit 6ed8392

File tree

1 file changed

+2
-2
lines changed
  • backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker

1 file changed

+2
-2
lines changed

backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ private List<String> normalizeAuthorizedKeys(String authorizedKeys) {
191191
private void storeRegenerateKeys() {
192192
if (vmInit.getRegenerateKeys() != null) {
193193
// Create new system ssh keys
194-
userData.put("ssh_deletekeys", String.valueOf(vmInit.getRegenerateKeys()));
194+
userData.put("ssh_deletekeys", vmInit.getRegenerateKeys());
195195
}
196196
}
197197

@@ -300,7 +300,7 @@ private void storeExecutionParameters() {
300300
metaData.put("launch_index", "0");
301301
metaData.put("availability_zone", "nova");
302302

303-
userData.put("disable_root", 0);
303+
userData.put("disable_root", false);
304304

305305
// Redirect log output from cloud-init execution from terminal
306306
Map<String, String> output = new HashMap<>();

0 commit comments

Comments
 (0)