diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/freezer/freezer-api/Dockerfile.j2 | 29 | ||||
| -rwxr-xr-x | docker/freezer/freezer-api/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/freezer/freezer-base/Dockerfile.j2 | 37 | ||||
| -rwxr-xr-x | docker/freezer/freezer-base/extend_start.sh | 15 | ||||
| -rw-r--r-- | docker/freezer/freezer-base/freezer_sudoers | 1 | ||||
| -rw-r--r-- | docker/freezer/freezer-scheduler/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 |
7 files changed, 0 insertions, 114 deletions
diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 deleted file mode 100644 index 9069aa726..000000000 --- a/docker/freezer/freezer-api/Dockerfile.j2 +++ /dev/null @@ -1,29 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}freezer-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block freezer_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set freezer_api_packages = [ -] %} - -{{ macros.install_packages(freezer_api_packages | customizable("packages")) }} - -ADD freezer-api-archive /freezer-api-source - -{% set freezer_api_pip_packages = [ - '/freezer-api' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_freezer_extend_start - -RUN ln -s freezer-api-source/* freezer-api \ - && {{ macros.install_pip(freezer_api_pip_packages | customizable("pip_packages")) }} \ - && cp -r /freezer-api/etc/freezer/* /etc/freezer/ \ - && chmod 644 /usr/local/bin/kolla_freezer_extend_start - -{% block freezer_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/freezer/freezer-api/extend_start.sh b/docker/freezer/freezer-api/extend_start.sh deleted file mode 100755 index 6070429b2..000000000 --- a/docker/freezer/freezer-api/extend_start.sh +++ /dev/null @@ -1,10 +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 - freezer-manage db update - exit 0 -fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 deleted file mode 100644 index 136f81459..000000000 --- a/docker/freezer/freezer-base/Dockerfile.j2 +++ /dev/null @@ -1,37 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block freezer_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='freezer') }} - -{% if base_package_type == 'deb' %} - {% set freezer_base_packages = [ - 'trickle' - ] %} -{{ macros.install_packages(freezer_base_packages | customizable("packages")) }} -{% endif %} - -ADD freezer-base-archive /freezer-base-source - -{% set freezer_base_pip_packages = [ - '/freezer' -] %} - -COPY freezer_sudoers /etc/sudoers.d/kolla_freezer_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN ln -s freezer-base-source/* freezer \ - && mkdir -p /etc/freezer \ - && {{ macros.install_pip(freezer_base_pip_packages | customizable("pip_packages")) }} \ - && cp -r /freezer/etc/* /etc/freezer \ - && chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_freezer_sudoers \ - && touch /usr/local/bin/kolla_freezer_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_freezer_extend_start - -{% block freezer_base_footer %}{% endblock %} diff --git a/docker/freezer/freezer-base/extend_start.sh b/docker/freezer/freezer-base/extend_start.sh deleted file mode 100755 index 44a641dd7..000000000 --- a/docker/freezer/freezer-base/extend_start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# Create log dir for freezer logs -LOG_DIR="/var/log/kolla/freezer" -if [[ ! -d "${LOG_DIR}" ]]; then - mkdir -p ${LOG_DIR} -fi -if [[ $(stat -c %U:%G ${LOG_DIR}) != "freezer:kolla" ]]; then - chown freezer:kolla ${LOG_DIR} -fi -if [[ $(stat -c %a ${LOG_DIR}) != "755" ]]; then - chmod 755 ${LOG_DIR} -fi - -. /usr/local/bin/kolla_freezer_extend_start diff --git a/docker/freezer/freezer-base/freezer_sudoers b/docker/freezer/freezer-base/freezer_sudoers deleted file mode 100644 index 8185fa507..000000000 --- a/docker/freezer/freezer-base/freezer_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R freezer\: /var/lib/freezer/, /bin/chown -R freezer\: /var/lib/freezer/ diff --git a/docker/freezer/freezer-scheduler/Dockerfile.j2 b/docker/freezer/freezer-scheduler/Dockerfile.j2 deleted file mode 100644 index 0c024e2b6..000000000 --- a/docker/freezer/freezer-scheduler/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}freezer-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block freezer_scheduler_header %}{% endblock %} - -RUN mkdir -p /etc/freezer/scheduler - -{% block freezer_scheduler_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER freezer diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 867fecb57..5035fd4fc 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -69,14 +69,6 @@ function config_designate_dashboard { done } -function config_freezer_ui { - for file in ${SITE_PACKAGES}/disaster_recovery/enabled/_*[^__].py; do - config_dashboard "${ENABLE_FREEZER:-no}" \ - "${SITE_PACKAGES}/disaster_recovery/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - function config_heat_dashboard { for file in ${SITE_PACKAGES}/heat_dashboard/enabled/_*[^__].py; do config_dashboard "${ENABLE_HEAT:-no}" \ @@ -233,7 +225,6 @@ function settings_changed { config_blazar_dashboard config_cloudkitty_dashboard config_designate_dashboard -config_freezer_ui config_heat_dashboard config_ironic_dashboard config_magnum_dashboard |
