From 36e5ef2d78dda256efc87242d22baffb7059802b Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Thu, 14 Jan 2021 09:13:51 +0100
Subject: [PATCH] Remove nova-mksproxy image

Signed-off-by: Christian Berendt <berendt@betacloud-solutions.de>
Change-Id: I3d101f171bd1cc6f3c192ddc98cea0d63bccb739
---
 doc/source/matrix_aarch64.csv                    |  1 -
 doc/source/matrix_x86.csv                        |  1 -
 docker/nova/nova-mksproxy/Dockerfile.j2          | 16 ----------------
 kolla/common/config.py                           |  4 ----
 kolla/image/build.py                             |  1 -
 ...ove-nova-mksproxy-image-bcfa231c8530771d.yaml |  3 +++
 roles/kolla-build-config/defaults/main.yml       |  1 -
 tools/version-check.py                           |  1 -
 8 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 docker/nova/nova-mksproxy/Dockerfile.j2
 create mode 100644 releasenotes/notes/remove-nova-mksproxy-image-bcfa231c8530771d.yaml

diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 8a0b22c74c..0df0d7468c 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -49,7 +49,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
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 3138323e2a..9b4ae03f1e 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -50,7 +50,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
diff --git a/docker/nova/nova-mksproxy/Dockerfile.j2 b/docker/nova/nova-mksproxy/Dockerfile.j2
deleted file mode 100644
index e4b7b729b8..0000000000
--- a/docker/nova/nova-mksproxy/Dockerfile.j2
+++ /dev/null
@@ -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
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 8df0d9bbd3..2df18ae8d5 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -573,10 +573,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/'
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 2172cb4bef..62db92ebf7 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -105,7 +105,6 @@ UNBUILDABLE_IMAGES = {
         "masakari-base",
         "monasca-base",
         "monasca-thresh",
-        "nova-mksproxy",
         "solum-base",
         "vmtp",
         "zun-base",
diff --git a/releasenotes/notes/remove-nova-mksproxy-image-bcfa231c8530771d.yaml b/releasenotes/notes/remove-nova-mksproxy-image-bcfa231c8530771d.yaml
new file mode 100644
index 0000000000..cad49014d5
--- /dev/null
+++ b/releasenotes/notes/remove-nova-mksproxy-image-bcfa231c8530771d.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - The ``nova-mksproxy`` image is removed per the deprecation cycle.
diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml
index 186f5d68f8..131532129d 100644
--- a/roles/kolla-build-config/defaults/main.yml
+++ b/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
diff --git a/tools/version-check.py b/tools/version-check.py
index 1988437921..7f9a4f889e 100755
--- a/tools/version-check.py
+++ b/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',
 }