diff --git a/README.rst b/README.rst index 08c6723600..ee5c893d5b 100644 --- a/README.rst +++ b/README.rst @@ -100,7 +100,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Tacker `__ - `Trove `__ - `Vitrage `__ -- `Vmtp `__ - `Watcher `__ - `Zun `__ diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index c6dfc5e567..b36c6ec5c2 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -66,7 +66,6 @@ telegraf,N,N,N,N,N,N tgtd,C,C,C,C,N,C trove,C,C,N,C,N,C vitrage,C,C,N,C,N,C -vmtp,N,C,N,C,N,C watcher,C,C,C,C,N,C zookeeper,C,C,C,C,N,C zun,N,C,N,C,N,C diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 661d62971d..9cb8e172a6 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -67,7 +67,6 @@ telegraf,C,C,C,C,C,N tgtd,N,N,C,T,C,C trove,C,C,C,C,N,C vitrage,C,C,N,C,C,C -vmtp,N,C,N,C,N,C watcher,C,C,C,C,C,C zookeeper,C,C,C,C,C,C zun,N,T,N,T,N,C diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2 deleted file mode 100644 index fe5c6ca5c0..0000000000 --- a/docker/vmtp/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 vmtp_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='vmtp') }} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - -{% set vmtp_pip_packages = [ - '/vmtp' -] %} - -ADD vmtp-archive /vmtp-source -RUN ln -s vmtp-source/* vmtp \ - && {{ macros.install_pip(vmtp_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/vmtp \ - && chown -R vmtp: /etc/vmtp - -{% endif %} - -COPY vmtp_sudoers /etc/sudoers.d/kolla_vmtp_sudoers -RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_vmtp_sudoers - -{% block vmtp_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER vmtp diff --git a/docker/vmtp/vmtp_sudoers b/docker/vmtp/vmtp_sudoers deleted file mode 100644 index fb3a27affc..0000000000 --- a/docker/vmtp/vmtp_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R vmtp\: /var/lib/vmtp, /bin/chown -R vmtp\: /var/lib/vmtp diff --git a/kolla/common/config.py b/kolla/common/config.py index 953a58f213..85cef0ac5b 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -624,10 +624,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/vitrage/' 'vitrage-${openstack_branch}.tar.gz')}, - 'vmtp': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/vmtp/' - 'vmtp-master.tar.gz')}, 'watcher-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher/' @@ -822,7 +818,7 @@ USERS = { 'uid': 42449, 'gid': 42449, }, - 'vmtp-user': { + 'vmtp-user': { # unused user (vmtp dropped) 'uid': 42450, 'gid': 42450, }, diff --git a/kolla/image/build.py b/kolla/image/build.py index 31858e1c06..939353732e 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -94,13 +94,11 @@ UNBUILDABLE_IMAGES = { "monasca-base", "monasca-thresh", "solum-base", - "vmtp", "zun-base", }, 'source': { "watcher-base", # https://bugs.launchpad.net/watcher/+bug/1952944 - "vmtp", # https://review.opendev.org/c/x/vmtp/+/820057 }, 'centos': { diff --git a/releasenotes/notes/drop-vmtp-3a889e0fa7a7f8ee.yaml b/releasenotes/notes/drop-vmtp-3a889e0fa7a7f8ee.yaml new file mode 100644 index 0000000000..d1ca1de73e --- /dev/null +++ b/releasenotes/notes/drop-vmtp-3a889e0fa7a7f8ee.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + Support for building ``vmtp`` has been dropped per the mailing list notice. + The ``vmtp`` project is no longer buildable, is outside of the OpenStack + namespace and looks plain abandoned. + `See the mailing list notice `__ diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index 9687f7bfd6..0b855330a1 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -66,7 +66,6 @@ kolla_build_sources: - mistral-base-plugin-tacker openstack/trove: trove-base openstack/vitrage: vitrage-base - openstack/vmtp: vmtp openstack/watcher: watcher-base openstack/zun: zun-base diff --git a/tools/version-check.py b/tools/version-check.py index 82ad6af731..2455033022 100755 --- a/tools/version-check.py +++ b/tools/version-check.py @@ -47,7 +47,6 @@ SKIP_PROJECTS = { # NOTE(hrw): those projects we take as they are they may have just one old # release or no stable branch tarballs ALWAYS_USE_VERSION_PROJECTS = { - 'vmtp', } # NOTE(hrw): those projects have different names for release tarballs (first