Skip to content

Commit

Permalink
Sree: support python3
Browse files Browse the repository at this point in the history
The Sree interface wasn't compatible with python3. Thoses changes allow
to run sree on both python 2 and 3.
This was breaking ceph nano (cn) with the CentOS 8 based ceph container
images (like master/octopus).

Multiple changes have been made to Sree to implement the python 3 suport
available in v0.2 [1]

The Sree tarball has been updated and the older one (v0.1) removed. Also
the SREE_VERSION variable in the travis configuration has been removed
because this wasn't used.

[1] leseb/Sree#3

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit fd329ef)
  • Loading branch information
dsavineau committed Apr 1, 2020
1 parent 822b01f commit cf8b546
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ before_install:

install:
- sudo ./travis-builds/prepare_osd_fs.sh
- docker run -d --name ceph-demo -v /etc/modprobe.d:/etc/modprobe.d -e RGW_FRONTEND_TYPE="${RGW_FRONTEND_TYPE}" -e BLUESTORE_BLOCK_SIZE=15GB -e DEBUG=verbose -e RGW_FRONTEND_PORT=8000 -e MON_IP=127.0.0.1 -e CEPH_PUBLIC_NETWORK=0.0.0.0/0 -e CLUSTER=test -e CEPH_DEMO_UID=demo -e CEPH_DEMO_ACCESS_KEY=G1EZ5R4K6IJ7XUQKMAED -e CEPH_DEMO_SECRET_KEY=cNmUrqpBKjCMzcfqG8fg4Qk07Xkoyau52OmvnSsz -e CEPH_DEMO_BUCKET=foobar -e SREE_VERSION=v0.1 -e SREE_PORT=5001 -e DATA_TO_SYNC=/etc/modprobe.d -e DATA_TO_SYNC_BUCKET=travis ceph/daemon:"travis-build-$TRAVIS_BRANCH-$TRAVIS_COMMIT"-"${CEPH_FLAVOR}"-centos-${CENTOS_RELEASE}-x86_64 demo
- docker run -d --name ceph-demo -v /etc/modprobe.d:/etc/modprobe.d -e RGW_FRONTEND_TYPE="${RGW_FRONTEND_TYPE}" -e BLUESTORE_BLOCK_SIZE=15GB -e DEBUG=verbose -e RGW_FRONTEND_PORT=8000 -e MON_IP=127.0.0.1 -e CEPH_PUBLIC_NETWORK=0.0.0.0/0 -e CLUSTER=test -e CEPH_DEMO_UID=demo -e CEPH_DEMO_ACCESS_KEY=G1EZ5R4K6IJ7XUQKMAED -e CEPH_DEMO_SECRET_KEY=cNmUrqpBKjCMzcfqG8fg4Qk07Xkoyau52OmvnSsz -e CEPH_DEMO_BUCKET=foobar -e SREE_PORT=5001 -e DATA_TO_SYNC=/etc/modprobe.d -e DATA_TO_SYNC_BUCKET=travis ceph/daemon:"travis-build-$TRAVIS_BRANCH-$TRAVIS_COMMIT"-"${CEPH_FLAVOR}"-centos-${CENTOS_RELEASE}-x86_64 demo
- sleep 5 # let's give the container 5sec to create its Ceph config file

script:
Expand Down
2 changes: 1 addition & 1 deletion src/daemon/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ADD ceph.defaults /opt/ceph-container/etc/

# Copye sree web interface for cn
# We use COPY instead of ADD for tarball so that it does not get extracted automatically at build time
COPY Sree-0.1.tar.gz /opt/ceph-container/tmp/sree.tar.gz
COPY Sree-0.2.tar.gz /opt/ceph-container/tmp/sree.tar.gz

# Modify the entrypoint
RUN bash "/opt/ceph-container/bin/generate_entrypoint.sh" && \
Expand Down
Binary file removed src/daemon/Sree-0.1.tar.gz
Binary file not shown.
Binary file added src/daemon/Sree-0.2.tar.gz
Binary file not shown.

0 comments on commit cf8b546

Please sign in to comment.