summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/upstream-backports
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-02-01 00:01:20 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-02-01 00:07:23 +0100
commit9be0bfc61b3321ba6b8b6ee5d39cf9238fddd33f (patch)
tree0f18df31ecde883758e9e9ee346abf6a8429fd2d /patches/opnfv-fuel/upstream-backports
parent2bde158711c7a93bbe7c03a8967780d31f491f7d (diff)
docker: fpb: Obsolete src override
Fuel@OPNFV recently applied a better fix for using the latest version of fpb, so obsolete our patch. Change-Id: I088fc31177e5c56ce09712b65a3dbd18eb013ce5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/upstream-backports')
-rw-r--r--patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch b/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch
index ccc37cb3..e4f55803 100644
--- a/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch
+++ b/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch
@@ -28,5 +28,5 @@ index 04c4d2b..54aca35 100644
+# FIXME(armband): Newer ffi is broken - https://jira.opnfv.org/browse/ARMBAND-191
+RUN gem install ffi -v 1.9.14
RUN gem install fpm
-
- # Temporary: fpb needs to be built from sources
+ RUN pip install git+https://github.com/openstack/fuel-plugins
+ # fuel-infra key