diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2018-04-26 02:16:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-26 02:16:56 +0000 |
| commit | 8de8b2c1a86468ea25e46040e32b3a2f284a5bac (patch) | |
| tree | a5980cd06464731b11cd3e613c09cbf8196a2ee9 | |
| parent | 12bd2fd8f69cc4635945fcf6cf451660cce7f1c6 (diff) | |
| parent | 6e398d3abf920b156917c0895ecfb07315774423 (diff) | |
Merge "Fix inject file error for openstack"
| -rw-r--r-- | share/newton_base/openoapi/server.py | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/share/newton_base/openoapi/server.py b/share/newton_base/openoapi/server.py index 95eab2bf..d21917a4 100644 --- a/share/newton_base/openoapi/server.py +++ b/share/newton_base/openoapi/server.py @@ -336,13 +336,30 @@ class Servers(APIView): contextarray = server.pop("contextArray", None) volumearray = server.pop("volumeArray", None) + userdata = server.pop("userdata", None) if contextarray: - # now set "contextArray" array - personalities = [] + user_data = [] + strUserData = '' + source_content = "" + dest_path = "" for context in contextarray: - personalities.append({"path": context["fileName"], "contents": context["fileData"]}) - if len(personalities) > 0: - server["personality"] = personalities + if context["fileName"] == "source_path": + source_content = context["fileData"] + if context["fileName"] == "dest_path": + dest_path = context["fileData"] + if len(source_content) > 0: + user_data.append("#cloud-config\n") + user_data.append("write_files:\n") + user_data.append("- encoding: b64\n") + user_data.append(" content: " + source_content + "\n") + user_data.append(" owner: root:root\n") + user_data.append(" path: " + dest_path + "\n") + user_data.append(" permissions: '0644'\n") + user_data.append("\n") + user_data.append("runcmd:") + user_data.append("- " + userdata + "\n") + strUserData.join(user_data) + server["user_data"] = user_data VimDriverUtils.replace_key_by_mapping(server, self.keys_mapping, True) |