Merge "Drop Solum"

16 files changed, 5 insertions, 115 deletions

diff --git a/README.rst b/README.rst
index 281f433d4..a1faf7ad1 100644
--- a/README.rst
+++ b/README.rst
@@ -93,7 +93,6 @@ Kolla provides images to deploy the following OpenStack projects:
 - `Nova <https://docs.openstack.org/nova/latest/>`__
 - `Octavia <https://docs.openstack.org/octavia/latest/>`__
 - Skyline (`APIServer <https://docs.openstack.org/skyline-apiserver/latest/>`__ and `Console <https://docs.openstack.org/skyline-console/latest/>`__)
-- `Solum <https://docs.openstack.org/solum/latest/>`__
 - `Swift <https://docs.openstack.org/swift/latest/>`__
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
 - `Trove <https://docs.openstack.org/trove/latest/>`__
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index abb899e3e..dfddf408b 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -49,7 +49,6 @@ prometheus,U,U,U
 rabbitmq,U,U,U
 redis,U,U,U
 skyline,U,U,U
-solum,U,U,U
 swift,U,U,U
 tacker,U,U,U
 telegraf,N,N,N
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 612b6c925..70fb8adba 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -50,7 +50,6 @@ prometheus,U,U,U
 rabbitmq,T,T,T
 redis,T,U,U
 skyline,U,U,U
-solum,U,U,U
 swift,T,T,U
 tacker,T,U,U
 telegraf,U,U,U
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index a9bce11b6..867fecb57 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -155,13 +155,6 @@ function config_octavia_dashboard {
         "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1482_project_load_balancer_panel.py"
 }
 
-function config_solum_dashboard {
-    for file in ${SITE_PACKAGES}/solumdashboard/local/enabled/_*[^__].py; do
-        config_dashboard "${ENABLE_SOLUM:-no}" \
-            "${SITE_PACKAGES}/solumdashboard/local/enabled/${file##*/}" \
-            "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
-    done
-}
 
 function config_tacker_dashboard {
     for file in ${SITE_PACKAGES}/tacker_horizon/enabled/_*[^__].py; do
@@ -249,7 +242,6 @@ config_masakari_dashboard
 config_mistral_dashboard
 config_neutron_vpnaas_dashboard
 config_octavia_dashboard
-config_solum_dashboard
 config_tacker_dashboard
 config_trove_dashboard
 config_venus_dashboard
diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2
deleted file mode 100644
index 92459029d..000000000
--- a/docker/solum/solum-api/Dockerfile.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block solum_api_header %}{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_solum_extend_start
-RUN chmod 644 /usr/local/bin/kolla_solum_extend_start
-
-{% block solum_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER solum
diff --git a/docker/solum/solum-api/extend_start.sh b/docker/solum/solum-api/extend_start.sh
deleted file mode 100644
index fd9625c83..000000000
--- a/docker/solum/solum-api/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    solum-db-manage --config-file /etc/solum/solum.conf upgrade head
-    exit 0
-fi
diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2
deleted file mode 100644
index 4de86d59f..000000000
--- a/docker/solum/solum-base/Dockerfile.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block solum_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='solum') }}
-
-ADD solum-base-archive /solum-base-source
-
-{% set solum_base_pip_packages = [
-    '/solum'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s solum-base-source/* solum \
-    && {{ macros.install_pip(solum_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/solum \
-    && cp -r /solum/etc/solum/* /etc/solum/ \
-    && touch /usr/local/bin/kolla_solum_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_solum_extend_start
-
-{% block solum_base_footer %}{% endblock %}
diff --git a/docker/solum/solum-base/extend_start.sh b/docker/solum/solum-base/extend_start.sh
deleted file mode 100644
index b80d4bfe0..000000000
--- a/docker/solum/solum-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/solum" ]]; then
-    mkdir -p /var/log/kolla/solum
-fi
-if [[ $(stat -c %a /var/log/kolla/solum) != "755" ]]; then
-    chmod 755 /var/log/kolla/solum
-fi
-
-. /usr/local/bin/kolla_solum_extend_start
diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2
deleted file mode 100644
index b5adbbd08..000000000
--- a/docker/solum/solum-conductor/Dockerfile.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block solum_conductor_header %}{% endblock %}
-
-{% block solum_conductor_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER solum
diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2
deleted file mode 100644
index 50ad84752..000000000
--- a/docker/solum/solum-deployer/Dockerfile.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block solum_deployer_header %}{% endblock %}
-
-{% block solum_deployer_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER solum
diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2
deleted file mode 100644
index 049a33dd6..000000000
--- a/docker/solum/solum-worker/Dockerfile.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block solum_worker_header %}{% endblock %}
-
-{% block solum_worker_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER solum
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 9c2e2efd3..1caacf0d8 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -102,7 +102,6 @@ _PROFILE_OPTS = [
                     'mistral',
                     'octavia',
                     'redis',
-                    'solum',
                     'tacker',
                     'telegraf',
                     'trove',
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index 6f8e03273..bd3286baf 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -139,10 +139,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/octavia-dashboard/'
                      'octavia-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-solum-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/solum-dashboard/'
-                     'solum-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-tacker-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/tacker-horizon/'
@@ -420,10 +416,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/skyline-console/'
                      'skyline-console-${openstack_branch}.tar.gz')},
-    'solum-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/solum/'
-                     'solum-${openstack_branch}.tar.gz')},
     'swift-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/swift/'
diff --git a/kolla/common/users.py b/kolla/common/users.py
index f3c559f52..159f8ac68 100644
--- a/kolla/common/users.py
+++ b/kolla/common/users.py
@@ -169,7 +169,7 @@ USERS = {
         'uid': 42443,
         'gid': 42443,
     },
-    'solum-user': {
+    'solum-user': {  # unused user (solum dropped)
         'uid': 42444,
         'gid': 42444,
     },
diff --git a/releasenotes/notes/drop-solum-79236f585eb5e9bf.yaml b/releasenotes/notes/drop-solum-79236f585eb5e9bf.yaml
new file mode 100644
index 000000000..b96036449
--- /dev/null
+++ b/releasenotes/notes/drop-solum-79236f585eb5e9bf.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    ``Solum`` container images have been dropped.
diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml
index 2317cc910..aeacad0c2 100644
--- a/roles/kolla-build-config/defaults/main.yml
+++ b/roles/kolla-build-config/defaults/main.yml
@@ -57,7 +57,6 @@ kolla_build_sources:
   openstack/nova: nova-base
   openstack/octavia: octavia-base
   openstack/skyline: skyline-base
-  openstack/solum: solum-base
   swift-base: openstack/swift
   openstack/tacker:
     - tacker-base
@@ -82,7 +81,6 @@ kolla_build_sources:
   openstack/monasca-ui: horizon-plugin-monasca-ui
   openstack/neutron-vpnaas-dashboard: horizon-plugin-neutron-vpnaas-dashboard
   openstack/octavia-dashboard: horizon-plugin-octavia-dashboard
-  openstack/solum-dashboard: horizon-plugin-solum-dashboard
   openstack/tacker-horizon: horizon-plugin-tacker-dashboard
   openstack/trove-dashboard: horizon-plugin-trove-dashboard
   openstack/venus-dashboard: horizon-plugin-venus-dashboard