From: John Spray <jspray@redhat.com>
Date: Tue, 30 Oct 2018 10:29:36 +0000 (+0000)
Subject: Merge pull request #23569 from jcsp/wip-kubejacker
X-Git-Tag: 3.2-0~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6d884fc3d575b7b6dd69e4b36ea2ccf49e9198e;p=ceph-ci.git

Merge pull request #23569 from jcsp/wip-kubejacker

script/kubejacker: include cls libs

Reviewed-by: Sage Weil <sage@redhat.com>
---

b6d884fc3d575b7b6dd69e4b36ea2ccf49e9198e
diff --cc src/script/kubejacker/Dockerfile
index 60c7578d8d6,e0b337d2062..ab6dc64443e
--- a/src/script/kubejacker/Dockerfile
+++ b/src/script/kubejacker/Dockerfile
@@@ -30,4 -22,6 +30,5 @@@ ADD lib.tar.gz /usr/lib64
  # Assume developer is using default paths (i.e. /usr/local), so
  # build binaries will be looking for libs there.
  ADD eclib.tar.gz /usr/local/lib64/ceph/erasure-code/
+ ADD clslib.tar.gz /usr/local/lib64/rados-classes/
  ADD mgr_plugins.tar.gz /usr/local/lib64/ceph/mgr
 -
diff --cc src/script/kubejacker/kubejacker.sh
index 13b1ffa5cf4,cf30a80dae9..cf30a80dae9
mode 100755,100644..100755
--- a/src/script/kubejacker/kubejacker.sh
+++ b/src/script/kubejacker/kubejacker.sh