diff --git a/README.rst b/README.rst index a1faf7ad11..1bc443c947 100644 --- a/README.rst +++ b/README.rst @@ -77,7 +77,6 @@ Kolla provides images to deploy the following OpenStack projects: - `CloudKitty `__ - `Cyborg `__ - `Designate `__ -- `Freezer `__ - `Glance `__ - `Heat `__ - `Horizon `__ diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index dfddf408b5..b296d7e5e2 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -13,7 +13,6 @@ designate,U,U,U dnsmasq,U,U,U etcd,U,U,U fluentd,U,U,U -freezer,U,U,U glance,U,U,U gnocchi,U,U,U grafana,U,U,U diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 70fb8adba9..771bfcf6c6 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -13,7 +13,6 @@ designate,U,U,U dnsmasq,T,T,U etcd,T,T,U fluentd,T,T,T -freezer,U,U,U glance,T,T,T gnocchi,U,U,U grafana,U,U,U diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 deleted file mode 100644 index 9069aa7261..0000000000 --- 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 6070429b27..0000000000 --- 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 136f81459f..0000000000 --- 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 44a641dd72..0000000000 --- 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 8185fa5071..0000000000 --- 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 0c024e2b69..0000000000 --- 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 867fecb579..5035fd4fc6 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 diff --git a/kolla/common/config.py b/kolla/common/config.py index 1caacf0d8f..37cf96814d 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -90,7 +90,6 @@ _PROFILE_OPTS = [ 'blazar', 'cloudkitty', 'designate', - 'freezer', 'gnocchi', 'influxdb', 'ironic', diff --git a/kolla/common/sources.py b/kolla/common/sources.py index bd3286bafc..686bca1103 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -66,14 +66,6 @@ SOURCES = { 'location': ('https://github.com/etcd-io/etcd/' 'releases/download/v${version}' '/etcd-v${version}-linux-${debian_arch}.tar.gz')}, - 'freezer-api': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/freezer-api/' - 'freezer-api-${openstack_branch}.tar.gz')}, - 'freezer-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/freezer/' - 'freezer-${openstack_branch}.tar.gz')}, 'glance-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/glance/' @@ -103,10 +95,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/designate-dashboard/' 'designate-dashboard-${openstack_branch}.tar.gz')}, - 'horizon-plugin-freezer-web-ui': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/freezer-web-ui/' - 'freezer-web-ui-${openstack_branch}.tar.gz')}, 'horizon-plugin-heat-dashboard': { 'type': 'url', 'location': ('$tarballs_base/openstack/heat-dashboard/' diff --git a/kolla/common/users.py b/kolla/common/users.py index 159f8ac685..817ac48e19 100644 --- a/kolla/common/users.py +++ b/kolla/common/users.py @@ -65,7 +65,7 @@ USERS = { 'uid': 42413, 'gid': 42413, }, - 'freezer-user': { + 'freezer-user': { # unused user (freezer dropped) 'uid': 42414, 'gid': 42414, }, diff --git a/releasenotes/notes/drop-freezer-06c0a19795156fe9.yaml b/releasenotes/notes/drop-freezer-06c0a19795156fe9.yaml new file mode 100644 index 0000000000..31207b92b1 --- /dev/null +++ b/releasenotes/notes/drop-freezer-06c0a19795156fe9.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for ``Freezer`` container images building have been dropped. diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index aeacad0c23..a4a96bf09f 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -22,8 +22,6 @@ kolla_build_sources: openstack/cinder: cinder-base openstack/cloudkitty: cloudkitty-base openstack/designate: designate-base - openstack/freezer: freezer-base - openstack/freezer-api: freezer-api openstack/glance: glance-base openstack/gnocchi: gnocchi-base openstack/heat: heat-base @@ -72,7 +70,6 @@ kolla_build_sources: openstack/blazar-dashboard: horizon-plugin-blazar-dashboard openstack/cloudkitty-dashboard: horizon-plugin-cloudkitty-dashboard openstack/designate-dashboard: horizon-plugin-designate-dashboard - openstack/freezer-web-ui: horizon-plugin-freezer-web-ui openstack/heat-dashboard: horizon-plugin-heat-dashboard openstack/ironic-ui: horizon-plugin-ironic-ui openstack/magnum-ui: horizon-plugin-magnum-ui