Merge "Remove nova-mksproxy image"

doc/source/matrix_aarch64.csv

@@ -48,7 +48,6 @@ murano,C,C,C,C,N,C
 neutron,C,C,C,C,N,C
 neutron-mlnx-agent,C,C,N,C,N,C
 nova,C,C,C,C,N,C
-nova-mksproxy (deprecated),C,C,C,C,N,C
 nova-spicehtml5proxy,N,N,C,C,N,C
 octavia,C,C,N,C,N,C
 openvswitch,C,C,C,C,N,C

doc/source/matrix_x86.csv

@@ -49,7 +49,6 @@ murano,C,C,C,C,C,C
 neutron,T,T,T,T,C,T
 neutron-mlnx-agent,C,C,N,C,N,C
 nova,T,T,T,T,C,T
-nova-mksproxy (deprecated),T,T,T,T,C,T
 nova-spicehtml5proxy,N,N,T,T,C,T
 octavia,C,C,N,C,C,C
 openvswitch,T,T,T,T,C,T

docker/nova/nova-mksproxy/Dockerfile.j2

@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block nova_mksproxy_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' && /bin/false
-{% endif %}
-
-{% block nova_mksproxy_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-USER nova

kolla/common/config.py

@@ -572,10 +572,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/blazar-nova/'
                      'blazar-nova-${openstack_branch}.tar.gz')},
-    'nova-base-plugin-mksproxy': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/nova-mksproxy/'
-                     'nova-mksproxy-master.tar.gz')},
     'octavia-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/octavia/'

kolla/image/build.py

@@ -105,7 +105,6 @@ UNBUILDABLE_IMAGES = {
         "masakari-base",
         "monasca-base",
         "monasca-thresh",
-        "nova-mksproxy",
         "solum-base",
         "vmtp",
         "zun-base",

releasenotes/notes/remove-nova-mksproxy-image-bcfa231c8530771d.yaml

@@ -0,0 +1,3 @@
+---
+upgrade:
+  - The ``nova-mksproxy`` image is removed per the deprecation cycle.

roles/kolla-build-config/defaults/main.yml

@@ -59,7 +59,6 @@ kolla_build_sources:
     - neutron-vpnaas-agent
     - neutron-base-plugin-vpnaas-agent
   openstack/nova: nova-base
-  openstack/nova-mksproxy: nova-base-plugin-mksproxy
   openstack/octavia: octavia-base
   openstack/panko:
     - ceilometer-base-plugin-panko

tools/version-check.py

@@ -73,7 +73,6 @@ ALWAYS_USE_VERSION_PROJECTS = {
     'vitrage-tempest-plugin',
     'watcher-tempest-plugin',
     'zaqar_tempest_plugin',
-    'nova-mksproxy',
     'tempest',
     'vmtp',
 }