From e49d5070a5f17c2aa52167ce157b4e3d4d6674dd Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 12 Oct 2016 21:32:05 +0200 Subject: Upstream: Fuel@OPNFV: Fuel Master VM templates While at it, also upstream: "build: Use OPNFV_GIT_SHA for ISO preparer ID" JIRA: ARMBAND-98 JIRA: ARMBAND-146 Conflicts: patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch patches/opnfv-fuel/0046-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch Change-Id: Ifcd7b3041d172aa492e26477c0872cd96efd90ba Signed-off-by: Alexandru Avadanii --- patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch') diff --git a/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch b/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch index d9fd36a0..69b0e82f 100644 --- a/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch +++ b/patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch @@ -20,7 +20,7 @@ index 07b0dc1..b0d6d37 100755 +++ b/build/docker/runcontext @@ -121,6 +121,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm --net=host \ -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \ - -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e ARMBAND_BASE -e OPNFV_GIT_SHA \ + -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA -e ARMBAND_BASE \ -u $USER_ID:$GROUP_ID -w $PWD \ + -v /etc/hosts:/etc/hosts \ -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT" -- cgit 1.2.3-korg