Merge "Remove tripleoclient container from Kolla"

doc/source/matrix_aarch64.csv

@@ -83,7 +83,6 @@ tacker,C,C,N,C,N,C
 telegraf,N,N,N,N,N,N
 tempest,C,N,C,N,N,N
 tgtd,C,C,C,C,N,C
-tripleoclient,N,N,N,N,N,N
 trove,C,C,N,C,N,C
 vitrage,C,C,N,C,N,C
 vmtp,N,C,N,C,N,C

doc/source/matrix_x86.csv

@@ -84,7 +84,6 @@ tacker,C,T,N,C,N,C
 telegraf,C,C,C,C,C,N
 tempest,C,C,C,C,C,C
 tgtd,C,T,C,T,C,C
-tripleoclient,C,N,N,N,N,N
 trove,C,C,C,C,N,C
 vitrage,C,C,N,C,C,C
 vmtp,N,C,N,C,N,C

docker/tripleoclient/Dockerfile.j2

@@ -1,40 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block tripleoclient_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set tripleoclient_packages = [
-                'e2fsprogs',
-                'git',
-                'openssh-clients',
-                'openstack-tripleo-validations',
-                'puppet-tripleo',
-                'python3-openstackclient',
-                'python3-tripleoclient',
-                'xfsprogs'
-        ] %}
-
-{{ macros.install_packages(tripleoclient_packages | customizable("packages")) }}
-
-    {% else %}
-RUN echo 'tripleoclient not yet available for {{ base_distro }}' && /bin/false
-    {% endif %}
-
-{% elif install_type == 'source' %}
-
-
-RUN echo 'tripleoclient not yet available for {{ base_distro }} source installs' && /bin/false
-
-{% endif %}
-
-COPY create_super_user.sh /usr/local/bin/create_super_user.sh
-RUN chmod 750 /usr/local/bin/create_super_user.sh
-
-{% block tripleoclient_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/tripleoclient/create_super_user.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-# This is a useful entrypoint/cmd if you wish to run commands in a container
-# in an existing users $HOME directory
-# For example: docker run -ti -e USER=stack -e UID=1000 --privileged=true --volume=/home/stack/:/home/stack/ tripleoclient:latest /usr/local/bin/create_super_user.sh
-
-if [ -n "$USER" -a -n "$UID" ]; then
-    useradd "$USER" -u "$UID" -M
-cat >> /etc/sudoers <<EOF_CAT
-$USER ALL=(ALL) NOPASSWD:ALL
-EOF_CAT
-    su -l $USER
-    export TERM="xterm"
-    alias ls='ls --color=auto'
-    /bin/bash
-else
-    echo "Please set valid $USER and $UID env variables."
-    exit 1
-fi

kolla/common/config.py

@@ -804,10 +804,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/tempest/'
                      'tempest-master.tar.gz')},
-    'tripleoclient': {
-        'type': 'url',
-        'location': ('$tarballs_base/python-tripleoclient/'
-                     'tripleoclient-12.3.0.tar.gz')},
     'trove-base': {
         'type': 'url',
         'location': ('$tarballs_base/trove/'

kolla/image/build.py

@@ -96,11 +96,6 @@ UNBUILDABLE_IMAGES = {
         "telegraf",          # no binary package
         "xtrabackup",        # no binary package
     },
-
-    'source': {
-        "tripleoclient",
-    },
-
     'binary': {
         "bifrost-base",
         "blazar-base",
@@ -196,7 +191,6 @@ UNBUILDABLE_IMAGES = {
         "senlin-conductor",  # no binary package
         "senlin-health-manager",  # no binary package
         "tacker-base",
-        "tripleoclient",
         "trove-base",
         "neutron-mlnx-agent",
     },
@@ -212,7 +206,6 @@ UNBUILDABLE_IMAGES = {
         "senlin-conductor",  # no binary package
         "senlin-health-manager",  # no binary package
         "tacker-base",
-        "tripleoclient",
         "vitrage-base",
         "zaqar",
         "neutron-mlnx-agent",

releasenotes/notes/tripleoclient_removal-7b131be589aa580f.yaml

@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    `tripleoclient` container image is removed. It is not needed nor useful.