diff --git a/ceph-config-helper/Dockerfile.suse_15 b/ceph-config-helper/Dockerfile.suse_15 new file mode 100644 index 00000000..00afcbe1 --- /dev/null +++ b/ceph-config-helper/Dockerfile.suse_15 @@ -0,0 +1,36 @@ +ARG FROM=docker.io/opensuse/leap:15 +FROM ${FROM} +LABEL maintainers=stephane@alum.mit.edu + +ARG KUBE_VERSION=v1.10.3 +ARG CEPH_RELEASE=luminous + RUN set -ex ;\ + TMP_DIR=$(mktemp --directory) ;\ + cd ${TMP_DIR} ;\ + zypper refresh ;\ + zypper up -y ;\ + zypper install -y \ + ca-certificates-cacert \ + ceph \ + curl \ + gcc \ + python \ + python-devel \ + python-xml \ + tar \ + jq ;\ + curl -sSL https://bootstrap.pypa.io/get-pip.py | python ;\ + pip --no-cache-dir install --upgrade \ + crush \ + rgwadmin \ + six \ + python-openstackclient \ + python-swiftclient ;\ + curl -sSL https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 ;\ + mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl ;\ + chmod +x /usr/bin/kubectl ;\ + rm -rf ${TMP_DIR} ;\ + zypper rm -y --clean-deps \ + python-devel \ + gcc ;\ + zypper clean -a diff --git a/doc/source/ceph-config-helper.rst b/doc/source/ceph-config-helper.rst index 036f5f94..757fca3b 100644 --- a/doc/source/ceph-config-helper.rst +++ b/doc/source/ceph-config-helper.rst @@ -6,8 +6,11 @@ This container builds a small image with kubectl and some other utilites for use in the ceph charts or interact with a ceph deployment. -Manual build for Ubuntu Xenial -============================== +Manual build +============ + +Ubuntu Xenial +------------- Here are the instructions for building Xenial image: @@ -20,3 +23,14 @@ Alternatively, this step can be performed by running the script directly: .. code-block:: shell ./ceph-config-helper/build.sh + + +openSUSE Leap 15 +---------------- + +To build an openSUSE leap 15 image, you can export varibles before +running the build script: + +.. code-block:: shell + + DISTRO=suse_15 ./ceph-config-helper/build.sh diff --git a/zuul.d/ceph-config-helper.yaml b/zuul.d/ceph-config-helper.yaml index f6e34471..05c0a2fb 100644 --- a/zuul.d/ceph-config-helper.yaml +++ b/zuul.d/ceph-config-helper.yaml @@ -17,12 +17,15 @@ check: jobs: - openstack-helm-images-ceph-config-helper-ubuntu_xenial + - openstack-helm-images-ceph-config-helper-suse_15 gate: jobs: - openstack-helm-images-ceph-config-helper-ubuntu_xenial + - openstack-helm-images-ceph-config-helper-suse_15 periodic: jobs: - openstack-helm-images-ceph-config-helper-ubuntu_xenial + - openstack-helm-images-ceph-config-helper-suse_15 #experimental: # jobs: # - openstack-helm-infra-five-ubuntu @@ -45,3 +48,13 @@ - ^zuul.d/ceph-config-helper.yaml vars: distro: "ubuntu_xenial" + +- job: + name: openstack-helm-images-ceph-config-helper-suse_15 + parent: openstack-helm-images-ceph-config-helper + files: + - ^ceph-config-helper/build.sh + - ^ceph-config-helper/Dockerfile.suse_15$ + - ^zuul.d/ceph-config-helper.yaml + vars: + distro: "suse_15"