diff options
| author | Davanum Srinivas <davanum@gmail.com> | 2016-05-03 08:35:22 -0400 |
|---|---|---|
| committer | Davanum Srinivas (dims) <davanum@gmail.com> | 2016-05-03 21:39:57 +0000 |
| commit | fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f (patch) | |
| tree | 9aedb685dc7b59b61f4017465a792e81352f9b19 /docker/zookeeper | |
| parent | 31d1271f1e0f19f1326c2e3858c5b0a2dc3c59ba (diff) | |
| download | kolla-fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f.tar.gz kolla-fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f.zip | |
Cleanup Mesos/Marathon related work
We got rid of the kolla-mesos repo:
http://git.openstack.org/cgit/openstack/kolla-mesos/tree/README.rst
So we don't need things in the main kolla tree
related to Mesos/Marathon
Closes-Bug: #1577951
Change-Id: Iafae63914c8a6601dc1b5b04231af8a1d2cc8642
Diffstat (limited to 'docker/zookeeper')
| -rw-r--r-- | docker/zookeeper/Dockerfile.j2 | 31 | ||||
| -rw-r--r-- | docker/zookeeper/extend_start.sh | 6 | ||||
| -rw-r--r-- | docker/zookeeper/zookeeper_sudoers | 1 |
3 files changed, 0 insertions, 38 deletions
diff --git a/docker/zookeeper/Dockerfile.j2 b/docker/zookeeper/Dockerfile.j2 deleted file mode 100644 index 9e60c033a..000000000 --- a/docker/zookeeper/Dockerfile.j2 +++ /dev/null @@ -1,31 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}mesosphere-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install \ - mesosphere-zookeeper \ - && yum clean all - -RUN useradd --user-group zookeeper - -{% elif base_distro in ['ubuntu', 'debian'] %} - -RUN apt-get install -y --no-install-recommends \ - zookeeper \ - && apt-get clean - -{% endif %} - -COPY zookeeper_sudoers /etc/sudoers.d/zookeeper_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/zookeeper_sudoers \ - && usermod -a -G kolla zookeeper - -ENV ZOOCFGDIR=/etc/zookeeper/conf - -{{ include_footer }} - -USER zookeeper diff --git a/docker/zookeeper/extend_start.sh b/docker/zookeeper/extend_start.sh deleted file mode 100644 index 5bca443b1..000000000 --- a/docker/zookeeper/extend_start.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# Only update permissions if permissions need to be updated -if [[ $(stat -c %U:%G /var/lib/zookeeper) != "zookeeper:zookeeper" ]]; then - sudo chown zookeeper: /var/lib/zookeeper -fi diff --git a/docker/zookeeper/zookeeper_sudoers b/docker/zookeeper/zookeeper_sudoers deleted file mode 100644 index e0f82de20..000000000 --- a/docker/zookeeper/zookeeper_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /bin/chown zookeeper\: /var/lib/zookeeper, /usr/bin/chown zookeeper\: /var/lib/zookeeper |