Merge "Remove tripleo-ui"

5 files changed, 4 insertions, 90 deletions

diff --git a/docker/tripleo-ui/Dockerfile.j2 b/docker/tripleo-ui/Dockerfile.j2
deleted file mode 100644
index b14e4dcaf..000000000
--- a/docker/tripleo-ui/Dockerfile.j2
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block tripleo_ui_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set tripleo_ui_packages = [
-                'httpd',
-                'mod_ssl',
-                'openstack-tripleo-ui'
-
-        ] %}
-
-{{ macros.install_packages(tripleo_ui_packages | customizable("packages")) }}
-
-RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
-    && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
-
-    {% else %}
-RUN echo 'tripleo-ui not yet available for {{ base_distro }}' && /bin/false
-    {% endif %}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set tripleo_ui_packages = [
-                'httpd',
-                'mod_ssl',
-                'bzip2',
-                'nodejs'
-
-        ] %}
-
-{{ macros.install_packages(tripleo_ui_packages | customizable("packages")) }}
-
-RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
-    && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
-
-    {% elif base_package_type == 'deb' %}
-RUN echo 'tripleo-ui not yet available for {{ base_distro }}' && /bin/false
-    {% endif %}
-
-ADD tripleo-ui-archive /tripleo-ui-source
-RUN cd tripleo-ui-source/package \
-    && npm install \
-    && npm run build \
-    && mkdir -p /var/www/openstack-tripleo-ui \
-    && cp -rf dist /var/www/openstack-tripleo-ui/
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
-{% block tripleo_ui_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/tripleo-ui/extend_start.sh b/docker/tripleo-ui/extend_start.sh
deleted file mode 100644
index 1277bea35..000000000
--- a/docker/tripleo-ui/extend_start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Assume the service runs on top of Apache when user is root
-if [[ "$(whoami)" == 'root' ]]; then
-    # NOTE(pbourke): httpd will not clean up after itself in some cases which
-    # results in the container not being able to restart. (bug #1489676, 1557036)
-    if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
-        # Loading Apache2 ENV variables
-        . /etc/apache2/envvars
-        install -d /var/run/apache2/
-        rm -rf /var/run/apache2/*
-    else
-        rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
-    fi
-fi
diff --git a/kolla/common/config.py b/kolla/common/config.py
index c0b6efcde..be40613ef 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -840,10 +840,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/python-tripleoclient/'
                      'tripleoclient-master.tar.gz')},
-    'tripleo-ui': {
-        'type': 'url',
-        'location': ('$tarballs_base/tripleo-ui/'
-                     'tripleo-ui-latest.tar.gz')},
     'trove-base': {
         'type': 'url',
         'location': ('$tarballs_base/trove/'
diff --git a/kolla/image/build.py b/kolla/image/build.py
index eea835d3a..7e5214ffd 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -100,9 +100,6 @@ SKIPPED_IMAGES = {
     'centos+source': [
         "ovsdpdk",
         "tripleoclient",
-        # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
-        # https://bugs.launchpad.net/tripleo/+bug/1744215
-        "tripleo-ui",
     ],
     'ubuntu+binary': [
         "almanach-base",
@@ -132,7 +129,6 @@ SKIPPED_IMAGES = {
         "solum-base",
         "tacker-base",
         "tripleoclient",
-        "tripleo-ui",
         "vitrage-base",
         "vmtp",
         "zaqar",
@@ -144,9 +140,6 @@ SKIPPED_IMAGES = {
         # There is no qdrouterd package for ubuntu bionic
         "qdrouterd",
         "tripleoclient",
-        # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
-        # https://bugs.launchpad.net/tripleo/+bug/1744215
-        "tripleo-ui"
     ],
     'debian+binary': [
         "almanach-base",
@@ -175,7 +168,6 @@ SKIPPED_IMAGES = {
         "solum-base",
         "tacker-base",
         "tripleoclient",
-        "tripleo-ui",
         "vitrage-base",
         "vmtp",
         "zaqar",
@@ -186,7 +178,6 @@ SKIPPED_IMAGES = {
         "cyborg-base",
         "sensu-base",
         "tripleoclient",
-        "tripleo-ui"
     ],
     'oraclelinux+binary': [
         "almanach-base",
@@ -212,9 +203,6 @@ SKIPPED_IMAGES = {
         "bifrost-base",
         "ovsdpdk",
         "tripleoclient",
-        # TODO(jeffrey4l): remove tripleo-ui when following bug is fixed
-        # https://bugs.launchpad.net/tripleo/+bug/1744215
-        "tripleo-ui"
     ]
 }
 
diff --git a/releasenotes/notes/remove-tripleo-ui-855da0b4f4c73385.yaml b/releasenotes/notes/remove-tripleo-ui-855da0b4f4c73385.yaml
new file mode 100644
index 000000000..10b951b30
--- /dev/null
+++ b/releasenotes/notes/remove-tripleo-ui-855da0b4f4c73385.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The tripleo-ui container is no longer built as the project has been retired.