diff --git a/README.rst b/README.rst index 27da2a2342..b2bad66d11 100644 --- a/README.rst +++ b/README.rst @@ -85,7 +85,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Heat `__ - `Horizon `__ - `Ironic `__ -- `Karbor `__ - `Keystone `__ - `Kuryr `__ - `Magnum `__ diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index ad9e052be0..614aecc963 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -32,7 +32,6 @@ ironic-neutron-agent,N,N,N,N,N,N ironic-inspector,N,N,N,N,N,N iscsid,C,C,C,C,N,C kafka,C,C,C,C,N,C -karbor,N,C,N,C,N,C keepalived,C,C,C,C,N,C keystone,C,C,C,C,N,C kibana,N,N,N,N,C,C diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 02bdaf69ac..969320d439 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -33,7 +33,6 @@ ironic-neutron-agent,T,T,N,T,N,C ironic-inspector,T,T,C,T,C,C iscsid,T,T,T,T,C,C kafka,C,C,C,C,C,C -karbor,N,C,N,C,N,C keepalived,T,T,T,T,C,C keystone,T,T,T,T,C,T kibana,C,C,C,C,C,C diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index a56f155efa..398ff52c5e 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -116,14 +116,6 @@ function config_ironic_dashboard { done } -function config_karbor_dashboard { - for file in ${SITE_PACKAGES}/karbor_dashboard/enabled/_*[^__].py; do - config_dashboard "${ENABLE_KARBOR}" \ - "${SITE_PACKAGES}/karbor_dashboard/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - function config_magnum_dashboard { for file in ${SITE_PACKAGES}/magnum_ui/enabled/_*[^__].py; do config_dashboard "${ENABLE_MAGNUM}" \ @@ -309,7 +301,6 @@ config_designate_dashboard config_freezer_ui config_heat_dashboard config_ironic_dashboard -config_karbor_dashboard config_magnum_dashboard config_manila_ui config_masakari_dashboard diff --git a/docker/karbor/karbor-api/Dockerfile.j2 b/docker/karbor/karbor-api/Dockerfile.j2 deleted file mode 100644 index 32b084f882..0000000000 --- a/docker/karbor/karbor-api/Dockerfile.j2 +++ /dev/null @@ -1,21 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block karbor_api_header %}{% endblock %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_karbor_extend_start -RUN chmod 755 /usr/local/bin/kolla_karbor_extend_start - -{% block karbor_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER karbor diff --git a/docker/karbor/karbor-api/extend_start.sh b/docker/karbor/karbor-api/extend_start.sh deleted file mode 100644 index c5102072e7..0000000000 --- a/docker/karbor/karbor-api/extend_start.sh +++ /dev/null @@ -1,8 +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 - karbor-manage db sync - exit 0 -fi diff --git a/docker/karbor/karbor-base/Dockerfile.j2 b/docker/karbor/karbor-base/Dockerfile.j2 deleted file mode 100644 index bb8c3eff3c..0000000000 --- a/docker/karbor/karbor-base/Dockerfile.j2 +++ /dev/null @@ -1,38 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block karbor_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='karbor') }} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - -ADD karbor-base-archive /karbor-base-source - -{% set karbor_base_pip_packages = [ - '/karbor' -] %} - -RUN ln -s karbor-base-source/* karbor \ - && {{ macros.install_pip(karbor_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/karbor \ - && cp -r /karbor/etc/* /etc/karbor/ \ - && chown -R karbor: /etc/karbor - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_karbor_extend_start \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_karbor_extend_start - -{% block karbor_base_footer %}{% endblock %} diff --git a/docker/karbor/karbor-base/extend_start.sh b/docker/karbor/karbor-base/extend_start.sh deleted file mode 100644 index db0fdacc82..0000000000 --- a/docker/karbor/karbor-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/karbor" ]]; then - mkdir -p /var/log/kolla/karbor -fi -if [[ $(stat -c %a /var/log/kolla/karbor) != "755" ]]; then - chmod 755 /var/log/kolla/karbor -fi - -. /usr/local/bin/kolla_karbor_extend_start diff --git a/docker/karbor/karbor-operationengine/Dockerfile.j2 b/docker/karbor/karbor-operationengine/Dockerfile.j2 deleted file mode 100644 index dbb95f57b4..0000000000 --- a/docker/karbor/karbor-operationengine/Dockerfile.j2 +++ /dev/null @@ -1,18 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block karbor_operationengine_header %}{% endblock %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - -{% block karbor_operationengine_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER karbor diff --git a/docker/karbor/karbor-protection/Dockerfile.j2 b/docker/karbor/karbor-protection/Dockerfile.j2 deleted file mode 100644 index 827b77abfc..0000000000 --- a/docker/karbor/karbor-protection/Dockerfile.j2 +++ /dev/null @@ -1,18 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block karbor_protection_header %}{% endblock %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - -{% block karbor_protection_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER karbor diff --git a/kolla/common/config.py b/kolla/common/config.py index 9bcc51007f..72c240d7c8 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -101,7 +101,6 @@ _PROFILE_OPTS = [ 'influxdb', 'ironic', 'kafka', - 'karbor', 'kuryr', 'magnum', 'manila', @@ -381,10 +380,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/ironic-ui/' 'ironic-ui-${openstack_branch}.tar.gz')}, - 'horizon-plugin-karbor-dashboard': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/karbor-dashboard/' - 'karbor-dashboard-${openstack_branch}.tar.gz')}, 'horizon-plugin-magnum-ui': { 'type': 'url', 'location': ('$tarballs_base/openstack/magnum-ui/' @@ -461,10 +456,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/ironic-inspector/' 'ironic-inspector-${openstack_branch}.tar.gz')}, - 'karbor-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/karbor/' - 'karbor-${openstack_branch}.tar.gz')}, 'keystone-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/keystone/' @@ -996,10 +987,6 @@ USERS = { 'uid': 42457, 'gid': 42457, }, - 'karbor-user': { - 'uid': 42458, - 'gid': 42458, - }, 'vitrage-user': { 'uid': 42459, 'gid': 42459, diff --git a/kolla/image/build.py b/kolla/image/build.py index 4644809c1f..165c974f06 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -101,7 +101,6 @@ UNBUILDABLE_IMAGES = { "blazar-base", "cyborg-base", "freezer-base", - "karbor-base", "kuryr-base", "masakari-base", "monasca-base", diff --git a/releasenotes/notes/remove-karbor-images-eec10ec28235fa69.yaml b/releasenotes/notes/remove-karbor-images-eec10ec28235fa69.yaml new file mode 100644 index 0000000000..ce763f2208 --- /dev/null +++ b/releasenotes/notes/remove-karbor-images-eec10ec28235fa69.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The ``Karbor`` project is no longer maintained and + `retired since Wallaby cycle`__ . Its images and support + is also removed since Wallaby cycle. + + __ http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018643.html diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index 2ba0362f83..3a7b34f6e5 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -30,7 +30,6 @@ kolla_build_sources: openstack/heat: heat-base openstack/ironic: ironic-base openstack/ironic-inspector: ironic-inspector - openstack/karbor: karbor-base openstack/keystone: keystone-base openstack/kuryr: kuryr-base openstack/kuryr-libnetwork: kuryr-libnetwork @@ -90,7 +89,6 @@ kolla_build_sources: openstack/freezer-web-ui: horizon-plugin-freezer-web-ui openstack/heat-dashboard: horizon-plugin-heat-dashboard openstack/ironic-ui: horizon-plugin-ironic-ui - openstack/karbor-dashboard: horizon-plugin-karbor-dashboard openstack/magnum-ui: horizon-plugin-magnum-ui openstack/manila-ui: horizon-plugin-manila-ui openstack/mistral-dashboard: horizon-plugin-mistral-dashboard