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 07:23:09 +0100 |
| commit | 689243a66a3ceadbf6626c188b37ef15c57f34d3 (patch) | |
| tree | 11c4eaee7d36c5a78210333d467cc168e21bc1d3 /docker/vnf/Dockerfile | |
| parent | f000082521039df4bbfee2f12d6d179861f927be (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>
(cherry picked from commit 39ab5b6cab5d6c664dc96bbb92781a9eed0aa41d)
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 c4d90afe1..2b01a1f36 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -19,7 +19,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 && \ @@ -48,7 +48,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 && \ @@ -74,7 +74,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"] |