Shahar Havivi has uploaded a new change for review.
Change subject: engine: CloudInit custom script section
......................................................................
engine: CloudInit custom script section
Custom Script:
User can add arbitrary CloudInit section in additional to the defaults
(such as hostname, timezone etc)
User can add files and other non supported sections.
This will add two new files:
write_files:
- content: |
# some file content
path: /root/myfile
- encoding: b64
content: CiMgVGhpcyBmaWxlIGNvbnRyb2xzIHRoZSBzdGF0ZSBvZiBTRUxpbnV4...
owner: root:root
path: /etc/sysconfig/selinux
permissions: '0644'
Bug-Url: https://bugzilla.redhat.com/1051041
Change-Id: Ibbe4107401cc5add22a519f6a18bad96f1055615
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, 4 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/24506/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 ed44f93..de626cd 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
@@ -34,7 +34,6 @@
private String interfaces;
private final String passwordKey = "password";
- private final String customScript = "customScript";
private enum CloudInitFileMode {
FILE,
@@ -60,7 +59,6 @@
storeNetwork();
storeTimeZone();
storeRootPassword();
- storeCustomScript();
} catch (IllegalArgumentException ex) {
throw new IllegalArgumentException("Malformed input", ex);
}
@@ -71,6 +69,10 @@
String metaDataStr = mapToJson(metaData);
String userDataStr = mapToYaml(userData);
+
+ if (vmInit.getCustomScript() != null) {
+ userDataStr += vmInit.getCustomScript();
+ }
// add #cloud-config for user data file head
if (StringUtils.isNotBlank(userDataStr)) {
@@ -181,12 +183,6 @@
if (!StringUtils.isEmpty(vmInit.getRootPassword())) {
// Note that this is in plain text in the config disk
userData.put(passwordKey, vmInit.getRootPassword());
- }
- }
-
- private void storeCustomScript() {
- if (!StringUtils.isEmpty(vmInit.getCustomScript())) {
- userData.put(customScript, vmInit.getCustomScript());
}
}
--
To view, visit http://gerrit.ovirt.org/24506
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbe4107401cc5add22a519f6a18bad96f1055615
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Shahar Havivi <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
