Remove novajoin image

Signed-off-by: Christian Berendt <berendt@betacloud-solutions.de>
Change-Id: Ia636747bc2d886f44abb2f4f816fcb621b90a298

11 files changed, 3 insertions, 116 deletions

diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 614aecc96..abaff9537 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -52,7 +52,6 @@ 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
-novajoin (deprecated),C,C,N,C,N,C
 octavia,C,C,N,C,N,C
 openvswitch,C,C,C,C,N,C
 ovn,C,C,C,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 969320d43..3d6c016ea 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -53,7 +53,6 @@ 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
-novajoin (deprecated),C,C,N,C,N,C
 octavia,C,C,N,C,C,C
 openvswitch,T,T,T,T,C,T
 ovn,C,C,C,C,C,C
diff --git a/docker/novajoin/novajoin-base/Dockerfile.j2 b/docker/novajoin/novajoin-base/Dockerfile.j2
deleted file mode 100644
index 720649f88..000000000
--- a/docker/novajoin/novajoin-base/Dockerfile.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block novajoin_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='novajoin') }}
-
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set novajoin_base_packages = [
-            'python3-novajoin'
-        ] %}
-    {% else %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-    {% endif %}
-
-{{ macros.install_packages(novajoin_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set novajoin_base_packages = [
-            'ipa-admintools',
-        ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
-        {% set novajoin_base_packages = [
-            'freeipa-client',
-        ] %}
-    {% endif %}
-
-{{ macros.install_packages(novajoin_base_packages | customizable("packages")) }}
-
-ADD novajoin-base-archive /novajoin-base-source
-
-{% set novajoin_base_pip_packages = [
-    '/novajoin'
-] %}
-
-RUN ln -s novajoin-base-source/* novajoin \
-    && {{ macros.install_pip(novajoin_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/nova /etc/novajoin \
-    && chown -R novajoin: /etc/nova /etc/novajoin
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 750 /etc/sudoers.d \
-    && touch /usr/local/bin/kolla_novajoin_extend_start \
-    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_novajoin_extend_start
-
-{% block novajoin_base_footer %}{% endblock %}
diff --git a/docker/novajoin/novajoin-base/extend_start.sh b/docker/novajoin/novajoin-base/extend_start.sh
deleted file mode 100644
index f5b38b898..000000000
--- a/docker/novajoin/novajoin-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/novajoin" ]]; then
-    mkdir -p /var/log/kolla/novajoin
-fi
-if [[ $(stat -c %a /var/log/kolla/novajoin) != "755" ]]; then
-    chmod 755 /var/log/kolla/novajoin
-fi
-
-. /usr/local/bin/kolla_novajoin_extend_start
diff --git a/docker/novajoin/novajoin-notifier/Dockerfile.j2 b/docker/novajoin/novajoin-notifier/Dockerfile.j2
deleted file mode 100644
index 29852a8de..000000000
--- a/docker/novajoin/novajoin-notifier/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}novajoin-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block novajoin_notifier_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-    {% if base_package_type != 'rpm' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-    {% endif %}
-{% endif %}
-
-{% block novajoin_notifier_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/novajoin/novajoin-server/Dockerfile.j2 b/docker/novajoin/novajoin-server/Dockerfile.j2
deleted file mode 100644
index 5dd000ce6..000000000
--- a/docker/novajoin/novajoin-server/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}novajoin-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block novajoin_server_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-    {% if base_package_type != 'rpm'  %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-    {% endif %}
-{% endif %}
-
-{% block novajoin_server_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 9c077c6d0..34ddfe29f 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -108,7 +108,6 @@ _PROFILE_OPTS = [
                     'mistral',
                     'monasca',
                     'murano',
-                    'novajoin',
                     'octavia',
                     'panko',
                     'rally',
@@ -585,10 +584,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/nova-mksproxy/'
                      'nova-mksproxy-master.tar.gz')},
-    'novajoin-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/novajoin/'
-                     'novajoin-master.tar.gz')},
     'octavia-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/octavia/'
@@ -1031,10 +1026,6 @@ USERS = {
         'uid': 42469,
         'gid': 42469,
     },
-    'novajoin-user': {
-        'uid': 42470,
-        'gid': 42470,
-    },
     'blazar-user': {
         'uid': 42471,
         'gid': 42471,
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 165c974f0..eed4fb27a 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -165,7 +165,6 @@ UNBUILDABLE_IMAGES = {
         "ec2-api",
         "ironic-neutron-agent",
         "nova-serialproxy",
-        "novajoin-base",
         "senlin-conductor",  # no binary package
         "senlin-health-manager",  # no binary package
         "tacker-base",
@@ -176,7 +175,6 @@ UNBUILDABLE_IMAGES = {
         "cloudkitty-base",
         "ec2-api",
         "ironic-neutron-agent",
-        "novajoin-base",
         "rally",
         "senlin-conductor",  # no binary package
         "senlin-health-manager",  # no binary package
diff --git a/releasenotes/notes/remove-novajoin-image-64b14b468c3f59d2.yaml b/releasenotes/notes/remove-novajoin-image-64b14b468c3f59d2.yaml
new file mode 100644
index 000000000..46534286b
--- /dev/null
+++ b/releasenotes/notes/remove-novajoin-image-64b14b468c3f59d2.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - The ``novajoin`` 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 3a7b34f6e..2293d327e 100644
--- a/roles/kolla-build-config/defaults/main.yml
+++ b/roles/kolla-build-config/defaults/main.yml
@@ -61,7 +61,6 @@ kolla_build_sources:
     - neutron-base-plugin-vpnaas-agent
   openstack/nova: nova-base
   openstack/nova-mksproxy: nova-base-plugin-mksproxy
-  openstack/novajoin: novajoin-base
   openstack/octavia: octavia-base
   openstack/panko:
     - ceilometer-base-plugin-panko
diff --git a/tools/version-check.py b/tools/version-check.py
index 5b45672fb..198843792 100755
--- a/tools/version-check.py
+++ b/tools/version-check.py
@@ -74,7 +74,6 @@ ALWAYS_USE_VERSION_PROJECTS = {
     'watcher-tempest-plugin',
     'zaqar_tempest_plugin',
     'nova-mksproxy',
-    'novajoin',
     'tempest',
     'vmtp',
 }