diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-07 01:38:44 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-07 05:28:41 +0100 |
| commit | 39ab5b6cab5d6c664dc96bbb92781a9eed0aa41d (patch) | |
| tree | 05aefefc4be5c9bb935532c12bac6838e0c05bd8 /docker/vnf/Dockerfile | |
| parent | 147f5a373b4c8659826f1f626bd9b6042afc3934 (diff) | |
Modify the upstream Clearwater Heat files
It forces a single network for both management and signaling traffic.
It meets the OPNFV deployment requirements and the Functest SUT ones.
The security group will be improved in a second step to first quickly
fix the testcase in gambia. Private IPs may be registered in DNS to
avoid network address translations.
Change-Id: Ic19cf336ac5c2d07c52c6dd37b06271790145cf9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/vnf/Dockerfile')
| -rw-r--r-- | docker/vnf/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index aba09ebbf..f0d4a8ed7 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -17,7 +17,7 @@ ENV GOPATH /src/epc-requirements/go ENV GOBIN /src/epc-requirements/go/bin ENV PATH $GOBIN:$PATH -COPY clearwater-heat-add-deps.patch /tmp/clearwater-heat-add-deps.patch +COPY clearwater-heat-singlenet-deps.patch /tmp/clearwater-heat-singlenet-deps.patch RUN apk --no-cache add --update \ ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ procps libxslt libxml2 zlib libffi python3 go musl-dev && \ @@ -45,7 +45,7 @@ RUN apk --no-cache add --update \ (cd /src/heat_vims && \ git fetch --tags https://github.com/Metaswitch/clearwater-heat.git $HEAT_VIMS_TAG && \ git checkout FETCH_HEAD && \ - patch -p1 < /tmp/clearwater-heat-add-deps.patch) && \ + patch -p1 < /tmp/clearwater-heat-singlenet-deps.patch) && \ git init /src/opnfv-vnf-vyos-blueprint && \ (cd /src/opnfv-vnf-vyos-blueprint && \ git fetch --tags https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git $VROUTER_BP_TAG && \ @@ -71,7 +71,7 @@ RUN apk --no-cache add --update \ rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/vims-test/.git /src/cloudify_vims/.git /src/heat_vims/.git /src/vims-test/quaff/.git \ /src/vims-test/build-infra/.git /src/opnfv-vnf-vyos-blueprint/.git \ /src/epc-requirements/abot_charm/.git /root/.cache/go-build \ - /tmp/clearwater-heat-add-deps.patch && \ + /tmp/clearwater-heat-singlenet-deps.patch && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |