diff options
Diffstat (limited to 'docker/glance')
| -rw-r--r-- | docker/glance/glance-api/Dockerfile.j2 | 38 | ||||
| -rw-r--r-- | docker/glance/glance-api/extend_start.sh | 27 | ||||
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 54 | ||||
| -rw-r--r-- | docker/glance/glance-base/etc/glance/rootwrap.conf | 27 | ||||
| -rw-r--r-- | docker/glance/glance-base/etc/glance/rootwrap.d/glance_cinder_store.filters | 12 | ||||
| -rw-r--r-- | docker/glance/glance-base/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/glance/glance-base/glance_sudoers | 1 |
7 files changed, 0 insertions, 169 deletions
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 deleted file mode 100644 index e3efbfef3..000000000 --- a/docker/glance/glance-api/Dockerfile.j2 +++ /dev/null @@ -1,38 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block glance_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - {% set glance_api_packages = [ - 'lsscsi', - 'device-mapper-multipath', - 'nvme-cli', - 'qemu-img', - 'systemd-udev' - ] %} -{% elif base_package_type == 'deb' %} - {% set glance_api_packages = [ - 'lsscsi', - 'multipath-tools', - 'nfs-common', - 'nvme-cli', - 'qemu-utils' - ] %} -{% endif %} - -{{ macros.install_packages(glance_api_packages | customizable("packages")) }} - -COPY extend_start.sh /usr/local/bin/kolla_glance_extend_start -RUN chmod 644 /usr/local/bin/kolla_glance_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block glance_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER glance diff --git a/docker/glance/glance-api/extend_start.sh b/docker/glance/glance-api/extend_start.sh deleted file mode 100644 index 3363539a5..000000000 --- a/docker/glance/glance-api/extend_start.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - glance-manage db_sync - glance-manage db_load_metadefs - exit 0 -fi - -# Migrate database and exit if KOLLA_UPGRADE variable is set. This catches all cases -# of the KOLLA_UPGRADE variable being set, including empty. -if [[ "${!KOLLA_UPGRADE[@]}" ]]; then - if [[ "${!GLANCE_DB_EXPAND[@]}" ]]; then - echo "Expanding database" - glance-manage db expand - fi - if [[ "${!GLANCE_DB_MIGRATE[@]}" ]]; then - echo "Migrating database" - glance-manage db migrate - fi - if [[ "${!GLANCE_DB_CONTRACT[@]}" ]]; then - echo "Contracting database" - glance-manage db contract - fi - exit 0 -fi diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 deleted file mode 100644 index 885cc4353..000000000 --- a/docker/glance/glance-base/Dockerfile.j2 +++ /dev/null @@ -1,54 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block glance_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='glance') }} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['ceph', 'epel']) }} - - {% set glance_base_packages = [ - 'python3-rados', - 'python3-rbd' - ] %} -{% elif base_package_type == 'deb' %} - {% set glance_base_packages = [ - 'python3-rados', - 'python3-rbd' - ] %} -{% endif %} - -{{ macros.install_packages(glance_base_packages | customizable("packages")) }} - -ADD glance-base-archive /glance-base-source - -{% set glance_base_pip_packages = [ - '/glance', - 'glance_store[cinder,vmware,swift,s3]' -] %} - -# add missing rootwrap config present in glance_store repo -COPY etc/glance /etc/glance -COPY glance_sudoers /etc/sudoers.d/kolla_glance_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN ln -s glance-base-source/* glance \ - && {{ macros.install_pip(glance_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/glance \ - && cp -r /glance/etc/* /etc/glance/ \ - && cp /var/lib/kolla/venv/etc/pycadf/glance_api_audit_map.conf /etc/glance/ \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/glance/rootwrap.conf \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_glance_sudoers \ - && touch /usr/local/bin/kolla_glance_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_glance_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block glance_base_footer %}{% endblock %} diff --git a/docker/glance/glance-base/etc/glance/rootwrap.conf b/docker/glance/glance-base/etc/glance/rootwrap.conf deleted file mode 100644 index 56e7529af..000000000 --- a/docker/glance/glance-base/etc/glance/rootwrap.conf +++ /dev/null @@ -1,27 +0,0 @@ -# Configuration for glance-rootwrap -# This file should be owned by (and only-writable by) the root user - -[DEFAULT] -# List of directories to load filter definitions from (separated by ','). -# These directories MUST all be only writeable by root ! -filters_path=/etc/glance/rootwrap.d,/usr/share/glance/rootwrap - -# List of directories to search executables in, in case filters do not -# explicitly specify a full path (separated by ',') -# If not specified, defaults to system PATH environment variable. -# These directories MUST all be only writeable by root ! -exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin - -# Enable logging to syslog -# Default value is False -use_syslog=False - -# Which syslog facility to use. -# Valid values include auth, authpriv, syslog, local0, local1... -# Default value is 'syslog' -syslog_log_facility=syslog - -# Which messages to log. -# INFO means log all usage -# ERROR means only log unsuccessful attempts -syslog_log_level=ERROR diff --git a/docker/glance/glance-base/etc/glance/rootwrap.d/glance_cinder_store.filters b/docker/glance/glance-base/etc/glance/rootwrap.d/glance_cinder_store.filters deleted file mode 100644 index 46c389b7e..000000000 --- a/docker/glance/glance-base/etc/glance/rootwrap.d/glance_cinder_store.filters +++ /dev/null @@ -1,12 +0,0 @@ -# glance-rootwrap command filters for glance cinder store -# This file should be owned by (and only-writable by) the root user - -[Filters] -# cinder store driver -disk_chown: RegExpFilter, chown, root, chown, \d+, /dev/(?!.*/\.\.).* - -# os-brick library commands -# os_brick.privileged.run_as_root oslo.privsep context -# This line ties the superuser privs with the config files, context name, -# and (implicitly) the actual python code invoked. -privsep-rootwrap: RegExpFilter, privsep-helper, root, privsep-helper, --config-file, /etc/(?!\.\.).*, --privsep_context, os_brick.privileged.default, --privsep_sock_path, /tmp/.* diff --git a/docker/glance/glance-base/extend_start.sh b/docker/glance/glance-base/extend_start.sh deleted file mode 100644 index 4f5f5ecaf..000000000 --- a/docker/glance/glance-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/glance" ]]; then - mkdir -p /var/log/kolla/glance -fi -if [[ $(stat -c %a /var/log/kolla/glance) != "755" ]]; then - chmod 755 /var/log/kolla/glance -fi - -. /usr/local/bin/kolla_glance_extend_start diff --git a/docker/glance/glance-base/glance_sudoers b/docker/glance/glance-base/glance_sudoers deleted file mode 100644 index 9af870983..000000000 --- a/docker/glance/glance-base/glance_sudoers +++ /dev/null @@ -1 +0,0 @@ -glance ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/glance-rootwrap /etc/glance/rootwrap.conf * |
