diff options
| -rwxr-xr-x | lcm/docker/Dockerfile | 3 | ||||
| -rw-r--r-- | lcm/lcm/nf/vnf_create/inst_vnf.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lcm/docker/Dockerfile b/lcm/docker/Dockerfile index 8597e409..cebfcd6b 100755 --- a/lcm/docker/Dockerfile +++ b/lcm/docker/Dockerfile @@ -6,6 +6,9 @@ ARG HTTPS_PROXY=${HTTPS_PROXY} ENV http_proxy $HTTP_PROXY ENV https_proxy $HTTPS_PROXY +RUN sed -i "s|set compatible|set nocompatible|" /etc/vim/vimrc.tiny \ & + echo "set backspace=2" >> /etc/vim/vimrc.tiny + RUN echo "mysql-server mysql-server/root_password password root" | debconf-set-selections RUN echo "mysql-server mysql-server/root_password_again password root" | debconf-set-selections diff --git a/lcm/lcm/nf/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnf_create/inst_vnf.py index 9ae25151..b87602c9 100644 --- a/lcm/lcm/nf/vnf_create/inst_vnf.py +++ b/lcm/lcm/nf/vnf_create/inst_vnf.py @@ -338,7 +338,7 @@ def flavor_save(job_id, nf_inst_id, ret): swap=get_integer(ignore_case_get(ret, "swap")), isPublic=get_boolean(ignore_case_get(ret, "isPublic")), extraspecs=ignore_case_get(ret, "extraSpecs"), - is_predefined=ignore_case_get(ret, "returnCode"), + is_predefined=ret.get("returnCode", int(0)), instid=nf_inst_id) |