diff options
Diffstat (limited to 'docker/zun/zun-compute')
| -rw-r--r-- | docker/zun/zun-compute/Dockerfile.j2 | 37 | ||||
| -rw-r--r-- | docker/zun/zun-compute/extend_start.sh | 5 | ||||
| -rw-r--r-- | docker/zun/zun-compute/zun_sudoers | 3 |
3 files changed, 0 insertions, 45 deletions
diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 deleted file mode 100644 index e6c778f0b..000000000 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ /dev/null @@ -1,37 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_compute_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['ceph', 'epel']) }} - -{% endif %} - -{% set zun_compute_packages = [ - 'ceph-common', - 'e2fsprogs', - 'pciutils', - 'xfsprogs', -] %} - -{{ macros.install_packages(zun_compute_packages | customizable("packages")) }} - -COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers -COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start - -RUN chmod 644 /usr/local/bin/kolla_zun_extend_start \ - && chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_zun_sudoers - -{{ macros.kolla_patch_sources() }} - -{% block zun_compute_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER zun diff --git a/docker/zun/zun-compute/extend_start.sh b/docker/zun/zun-compute/extend_start.sh deleted file mode 100644 index f3b6fc48b..000000000 --- a/docker/zun/zun-compute/extend_start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -gid=$(stat -c "%g" /var/run/docker.sock) -sudo groupadd --force --gid $gid docker -sudo usermod -aG docker zun diff --git a/docker/zun/zun-compute/zun_sudoers b/docker/zun/zun-compute/zun_sudoers deleted file mode 100644 index b3a39af7d..000000000 --- a/docker/zun/zun-compute/zun_sudoers +++ /dev/null @@ -1,3 +0,0 @@ -zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf * -zun ALL=(root) NOPASSWD: /usr/sbin/groupadd --force --gid * -zun ALL=(root) NOPASSWD: /usr/sbin/usermod -aG docker zun |
