Merge "Drop Senlin"

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/>`__
 - `Sahara <https://docs.openstack.org/sahara/latest/>`__ (deprecated)
-- `Senlin <https://docs.openstack.org/senlin/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/>`__

doc/source/matrix_aarch64.csv

@@ -49,7 +49,6 @@ prometheus,U,U,U
 rabbitmq,U,U,U
 redis,U,U,U
 sahara,U,U,U
-senlin,U,U,U
 skyline,U,U,U
 solum,U,U,U
 swift,U,U,U

doc/source/matrix_x86.csv

@@ -50,7 +50,6 @@ prometheus,U,U,U
 rabbitmq,T,T,T
 redis,T,U,U
 sahara,U,U,U
-senlin,U,U,U
 skyline,U,U,U
 solum,U,U,U
 swift,T,T,U

docker/horizon/extend_start.sh

@@ -163,18 +163,6 @@ function config_sahara_dashboard {
     done
 }
 
-function config_senlin_dashboard {
-    for file in ${SITE_PACKAGES}/senlin_dashboard/enabled/_*[^__].py; do
-        config_dashboard "${ENABLE_SENLIN:-no}" \
-            "${SITE_PACKAGES}/senlin_dashboard/enabled/${file##*/}" \
-            "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
-    done
-
-    config_dashboard "${ENABLE_SENLIN:-no}" \
-        "${SITE_PACKAGES}/senlin_dashboard/conf/senlin_policy.json" \
-        "/etc/openstack-dashboard/senlin_policy.json"
-}
-
 function config_solum_dashboard {
     for file in ${SITE_PACKAGES}/solumdashboard/local/enabled/_*[^__].py; do
         config_dashboard "${ENABLE_SOLUM:-no}" \
@@ -270,7 +258,6 @@ config_mistral_dashboard
 config_neutron_vpnaas_dashboard
 config_octavia_dashboard
 config_sahara_dashboard
-config_senlin_dashboard
 config_solum_dashboard
 config_tacker_dashboard
 config_trove_dashboard

docker/senlin/senlin-api/Dockerfile.j2

@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block senlin_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_senlin_extend_start
-RUN chmod 644 /usr/local/bin/kolla_senlin_extend_start
-
-{% block senlin_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER senlin

docker/senlin/senlin-api/extend_start.sh

@@ -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
-    senlin-manage --config-file /etc/senlin/senlin.conf db_sync
-    exit 0
-fi

docker/senlin/senlin-base/Dockerfile.j2

@@ -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 senlin_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='senlin') }}
-
-ADD senlin-base-archive /senlin-base-source
-
-{% set senlin_base_pip_packages = [
-    '/senlin'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s senlin-base-source/* senlin \
-    && {{ macros.install_pip(senlin_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/senlin \
-    && cp -r /senlin/etc/senlin/* /etc/senlin \
-    && touch /usr/local/bin/kolla_senlin_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_senlin_extend_start
-
-{% block senlin_base_footer %}{% endblock %}

docker/senlin/senlin-base/extend_start.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/senlin" ]]; then
-    mkdir -p /var/log/kolla/senlin
-fi
-if [[ $(stat -c %a /var/log/kolla/senlin) != "755" ]]; then
-    chmod 755 /var/log/kolla/senlin
-fi
-
-. /usr/local/bin/kolla_senlin_extend_start

docker/senlin/senlin-conductor/Dockerfile.j2

@@ -1,13 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block senlin_conductor_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% block senlin_conductor_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER senlin

docker/senlin/senlin-engine/Dockerfile.j2

@@ -1,13 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block senlin_engine_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% block senlin_engine_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER senlin

docker/senlin/senlin-health-manager/Dockerfile.j2

@@ -1,11 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block senlin_health_manager_header %}{% endblock %}
-
-{% block senlin_health_manager_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER senlin

kolla/common/config.py

@@ -103,7 +103,6 @@ _PROFILE_OPTS = [
                     'octavia',
                     'redis',
                     'sahara',
-                    'senlin',
                     'solum',
                     'tacker',
                     'telegraf',

kolla/common/sources.py

@@ -143,10 +143,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/sahara-dashboard/'
                      'sahara-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-senlin-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/senlin-dashboard/'
-                     'senlin-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-solum-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/solum-dashboard/'
@@ -448,10 +444,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/sahara-plugin-vanilla/'
                      'sahara-plugin-vanilla-${openstack_branch}.tar.gz')},
-    'senlin-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/senlin/'
-                     'senlin-${openstack_branch}.tar.gz')},
     'skyline-apiserver': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/skyline-apiserver/'

kolla/common/users.py

@@ -165,7 +165,7 @@ USERS = {
         'uid': 42441,
         'gid': 42441,
     },
-    'senlin-user': {
+    'senlin-user': {  # unused user (senlin dropped)
         'uid': 42443,
         'gid': 42443,
     },

releasenotes/notes/drop-senlin-aadc2bd1eb50d046.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    ``Senlin`` container images have been dropped.

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

@@ -57,7 +57,6 @@ kolla_build_sources:
   openstack/nova: nova-base
   openstack/octavia: octavia-base
   openstack/sahara: sahara-base
-  openstack/senlin: senlin-base
   openstack/skyline: skyline-base
   openstack/solum: solum-base
   swift-base: openstack/swift
@@ -85,7 +84,6 @@ kolla_build_sources:
   openstack/neutron-vpnaas-dashboard: horizon-plugin-neutron-vpnaas-dashboard
   openstack/octavia-dashboard: horizon-plugin-octavia-dashboard
   openstack/sahara-dashboard: horizon-plugin-sahara-dashboard
-  openstack/senlin-dashboard: horizon-plugin-senlin-dashboard
   openstack/solum-dashboard: horizon-plugin-solum-dashboard
   openstack/tacker-horizon: horizon-plugin-tacker-dashboard
   openstack/trove-dashboard: horizon-plugin-trove-dashboard