diff --git a/README.rst b/README.rst index 83b42e0f41..d61ff143b8 100644 --- a/README.rst +++ b/README.rst @@ -93,7 +93,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Neutron `__ - `Nova `__ - `Octavia `__ -- `Panko `__ - `Rally `__ [deprecated] - `Sahara `__ - `Senlin `__ diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index 858a5f5e35..1f7e9fac9b 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -53,7 +53,6 @@ octavia,C,C,N,C,N,C openvswitch,C,C,C,C,N,C ovn,C,C,C,C,N,N ovsdpdk,N,N,C,C,N,C -panko,C,C,C,C,N,C placement,C,C,N,C,N,C prometheus,C,C,C,C,N,C qdrouterd,C,C,C,C,N,N diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 9e113fed27..ff7dd6a19d 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -54,7 +54,6 @@ octavia,C,C,N,C,C,C openvswitch,T,T,T,T,C,T ovn,C,C,C,C,N,N ovsdpdk,N,N,C,C,C,C -panko,C,C,C,C,C,C placement,T,T,T,T,C,T prometheus,C,C,C,C,C,C qdrouterd,C,C,N,N,N,N diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 23a35a1ccd..019fad8de0 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -15,14 +15,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-ceilometer-common', 'python3-gnocchiclient', 'python3-oslo-db', - 'python3-panko', 'python3-tooz' ] %} {% elif base_package_type == 'deb' %} {% set ceilometer_base_packages = [ 'ceilometer-common', 'python3-gnocchiclient', - 'python3-panko', 'python3-pymongo' ] %} {% endif %} diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2 deleted file mode 100644 index 1d1d560629..0000000000 --- a/docker/panko/panko-api/Dockerfile.j2 +++ /dev/null @@ -1,30 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}panko-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block panko_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set panko_api_packages = [ - 'openstack-panko-api', - 'python3-pymongo' - ] %} - {% elif base_package_type == 'deb' %} - {% set panko_api_packages = [ - 'panko-api', - 'python3-pymongo' - ] %} - - {% endif %} -{{ macros.install_packages(panko_api_packages | customizable("packages")) }} -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_panko_extend_start -RUN chmod 755 /usr/local/bin/kolla_panko_extend_start - -{% block panko_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/panko/panko-api/extend_start.sh b/docker/panko/panko-api/extend_start.sh deleted file mode 100644 index b7902e8541..0000000000 --- a/docker/panko/panko-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 - panko-dbsync - exit 0 -fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 deleted file mode 100644 index 23af2af02e..0000000000 --- a/docker/panko/panko-base/Dockerfile.j2 +++ /dev/null @@ -1,58 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block panko_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='panko') }} - -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - - {% set panko_base_packages = [ - 'openstack-panko-common', - ] %} - {% elif base_package_type == 'deb' %} - {% set panko_base_packages = [ - ] %} - {% endif %} - -{{ macros.install_packages(panko_base_packages | customizable("packages")) }} -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - - {% set panko_base_packages = [ - ] %} -{{ macros.install_packages(panko_base_packages | customizable("packages")) }} - {% elif base_package_type == 'deb' %} - - {% set panko_base_packages = [ - ] %} - -{{ macros.install_packages(panko_base_packages | customizable("packages")) }} - - {% endif %} -ADD panko-base-archive /panko-base-source - -{% set panko_base_pip_packages = [ - '/panko', - 'pymongo' -] %} - -RUN ln -s panko-base-source/* panko \ - && {{ macros.install_pip(panko_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/panko \ - && cp -r /panko/etc/panko/* /etc/panko/ \ - && chown -R panko: /etc/panko - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_panko_extend_start \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_panko_extend_start - -{% block panko_base_footer %}{% endblock %} diff --git a/docker/panko/panko-base/extend_start.sh b/docker/panko/panko-base/extend_start.sh deleted file mode 100644 index 32cb5a96bc..0000000000 --- a/docker/panko/panko-base/extend_start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -PANKO_LOG_DIR=/var/log/kolla/panko - -if [[ ! -d "${PANKO_LOG_DIR}" ]]; then - mkdir -p ${PANKO_LOG_DIR} -fi -if [[ $(stat -c %U:%G ${PANKO_LOG_DIR}) != "panko:kolla" ]]; then - chown panko:kolla ${PANKO_LOG_DIR} -fi -if [[ $(stat -c %a ${PANKO_LOG_DIR}) != "755" ]]; then - chmod 755 ${PANKO_LOG_DIR} -fi - -. /usr/local/bin/kolla_panko_extend_start diff --git a/kolla/common/config.py b/kolla/common/config.py index 64affd5f49..b274e2a60f 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -106,7 +106,6 @@ _PROFILE_OPTS = [ 'monasca', 'murano', 'octavia', - 'panko', 'rally', 'redis', 'sahara', @@ -304,10 +303,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/ceilometer/' 'ceilometer-${openstack_branch}.tar.gz')}, - 'ceilometer-base-plugin-panko': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/panko/' - 'panko-${openstack_branch}.tar.gz')}, 'cinder-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/cinder/' @@ -566,10 +561,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/ovn-octavia-provider/' 'ovn-octavia-provider-${openstack_branch}.tar.gz')}, - 'panko-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/panko/' - 'panko-${openstack_branch}.tar.gz')}, 'placement-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/placement/' @@ -880,10 +871,6 @@ USERS = { 'uid': 42437, 'gid': 42437, }, - 'panko-user': { - 'uid': 42438, - 'gid': 42438, - }, 'rabbitmq-user': { 'uid': 42439, 'gid': 42439, diff --git a/releasenotes/notes/remove-panko-5338b559.yaml b/releasenotes/notes/remove-panko-5338b559.yaml new file mode 100644 index 0000000000..74fc87b067 --- /dev/null +++ b/releasenotes/notes/remove-panko-5338b559.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - Support for panko has been removed due to upstream retirement. diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index db2de97244..b88aa2b9ef 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -57,9 +57,6 @@ kolla_build_sources: - neutron-base-plugin-vpnaas-agent openstack/nova: nova-base openstack/octavia: octavia-base - openstack/panko: - - ceilometer-base-plugin-panko - - panko-base openstack/rally: rally openstack/sahara: sahara-base openstack/senlin: senlin-base