diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2018-04-28 08:59:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-28 08:59:30 +0000 |
| commit | d9e4a0167f390e662b26aa7526c58daf8c047d14 (patch) | |
| tree | 0420a5bc51e78fd4fbef572779deceb22c764c90 /share/newton_base/openoapi/server.py | |
| parent | 4e992efafb6e5a971bb481abbaec83a4a7889b85 (diff) | |
| parent | fa1c1b60fc11d6e7155bd0fe378e63527f826bfa (diff) | |
Merge "Support inject many files"
Diffstat (limited to 'share/newton_base/openoapi/server.py')
| -rw-r--r-- | share/newton_base/openoapi/server.py | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/share/newton_base/openoapi/server.py b/share/newton_base/openoapi/server.py index 29823432..ba77dc55 100644 --- a/share/newton_base/openoapi/server.py +++ b/share/newton_base/openoapi/server.py @@ -367,24 +367,21 @@ class Servers(APIView): strUserData = '' source_content = "" dest_path = "" + user_data.append("#cloud-config\n") for context in contextarray: - 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(" content: " + context["source_data_base64"] + "\n") user_data.append(" owner: root:root\n") - user_data.append(" path: " + dest_path + "\n") + user_data.append(" path: " + context["dest_path"] + "\n") user_data.append(" permissions: '0644'\n") user_data.append("\n") - user_data.append("runcmd:") + if userdata: + user_data.append("runcmd:\n") user_data.append("- " + userdata + "\n") - strUserData.join(user_data) - server["user_data"] = user_data + + strUserData.join(user_data) + server["user_data"] = strUserData VimDriverUtils.replace_key_by_mapping(server, self.keys_mapping, True) |