summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-29 15:37:41 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-29 15:37:41 +0100
commitcee4e0ca227509ea8386934a15f748b8077f4e18 (patch)
tree406b9cfeced81034764085159532a11915b568c3
parentec0efb4ade14f268bedcd9f74b9823253324d41b (diff)
[patch] docker: Explicitly install python-futures
For x86_64, the Saltstack bootstrapping scripts fetch a custom build of `python-tornado` DEB package, which being arch-specific won't be picked up on AArch64 (and a similar version from Ubuntu Xenial repos will be used instead). Although the Ubuntu package works just fine, it lacks a hard dependency on `python-futures`, which became mandatory in Salt 2017.7.8, see [1]. Explicitly install `python-futures` inside cfg01 Docker container during build, which will be a no-op on x86_64 and fix the issue on AArch64. [1] https://github.com/saltstack/salt/issues/50220 Change-Id: Ie4aad064572788c0852aaf398f21437b456becbe Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch
index d283d06b6..57cf436ef 100644
--- a/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch
+++ b/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch
@@ -21,11 +21,11 @@ Subject: [PATCH] OPNFV package installation, Ubuntu user
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- DockerMake.yml | 37 ++++++++++++++++++++++++++++++++++++-
- 1 file changed, 36 insertions(+), 1 deletion(-)
+ DockerMake.yml | 38 +++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/DockerMake.yml b/DockerMake.yml
-index 2c75586..eb06cbd 100644
+index 2c75586..9ab7195 100644
--- a/DockerMake.yml
+++ b/DockerMake.yml
@@ -29,6 +29,7 @@ common-cleanup:
@@ -45,7 +45,7 @@ index 2c75586..eb06cbd 100644
ENV SALT_FORMULA_SOURCES $SALT_FORMULA_SOURCES
ARG SALT_FORMULAS_BASE="/srv/salt/formula"
ENV SALT_FORMULAS_BASE $SALT_FORMULAS_BASE
-@@ -108,6 +109,40 @@ salt-formulas:
+@@ -108,6 +109,41 @@ salt-formulas:
&& bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \
&& eval ${LAYER_CLEANUP}
@@ -72,6 +72,7 @@ index 2c75586..eb06cbd 100644
+ kmod \
+ net-tools \
+ openssh-server \
++ python-futures \
+ python-m2crypto \
+ python-msgpack \
+ python-netaddr \