Merge "Drop vmtp"

README.rst

@@ -100,7 +100,6 @@ Kolla provides images to deploy the following OpenStack projects:
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
 - `Trove <https://docs.openstack.org/trove/latest/>`__
 - `Vitrage <https://docs.openstack.org/vitrage/latest/>`__
-- `Vmtp <https://vmtp.readthedocs.io/en/latest/>`__
 - `Watcher <https://docs.openstack.org/watcher/latest/>`__
 - `Zun <https://docs.openstack.org/zun/latest/>`__
 

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

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

docker/vmtp/Dockerfile.j2

@@ -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

docker/vmtp/vmtp_sudoers

@@ -1 +0,0 @@
-%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R vmtp\: /var/lib/vmtp, /bin/chown -R vmtp\: /var/lib/vmtp

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,
     },

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': {

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 <http://lists.openstack.org/pipermail/openstack-discuss/2021-December/026232.html>`__

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
 

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