Remove zaqar

Removal of zaqar container build items.

Change-Id: I4872a188f800af3b875d065d829b4be15d3c60df
Depends-On: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/809463/

container-images/kolla/base/uid_gid_manage.sh

@@ -70,7 +70,6 @@ _SUPPORTED_USERS['rabbitmq']='rabbitmq 42439 42439 /var/lib/rabbitmq kolla'
 _SUPPORTED_USERS['redis']='redis 42460 42460 /run/redis kolla'
 _SUPPORTED_USERS['swift']='swift 42445 42445 /var/lib/swift kolla'
 _SUPPORTED_USERS['tempest']='tempest 42480 42480 /var/lib/tempest kolla'
-_SUPPORTED_USERS['zaqar']='zaqar 42452 42452 /var/lib/zaqar kolla'
 
 for _USER_TO_CREATE in $_USERS_TO_CREATE; do
     # Initialize computed args

container-images/tcib/base/os/os.yaml

@@ -17,5 +17,4 @@ tcib_packages:
   - python3-octaviaclient
   - python3-openstackclient
   - python3-swiftclient
-  - python3-zaqarclient
   - python3-pymemcache

container-images/tcib/base/os/zaqar-wsgi/zaqar-wsgi.yaml

@@ -1,10 +0,0 @@
-tcib_actions:
-- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
-- run: mkdir -p /var/www/cgi-bin/zaqar && chown -R zaqar /var/www/cgi-bin/zaqar && cp -a /usr/lib/python3.6/site-packages/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar/ && chmod 755 /var/www/cgi-bin/zaqar && 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
-tcib_packages:
-  common:
-  - httpd
-  - mod_ssl
-  - openstack-zaqar
-  - python3-ldappool
-  - python3-mod_wsgi

container-images/tripleo_containers.yaml

@@ -163,8 +163,6 @@ container_images:
   image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-swift-proxy-server:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-zaqar-wsgi:current-tripleo
-  image_source: tripleo
 - imagename: quay.io/ceph/daemon:v6.0.4-stable-6.0-pacific-centos-8-x86_64
   image_source: ceph
 - imagename: quay.ceph.io/prometheus/prometheus:v2.7.2

container-images/tripleo_containers.yaml.j2

@@ -709,14 +709,6 @@ container_images_template:
   - OS::TripleO::Services::SwiftRingBuilder
   - OS::TripleO::Services::SwiftStorage
 
-- imagename: "{{namespace}}/{{name_prefix}}zaqar-wsgi{{name_suffix}}:{{tag}}"
-  image_source: tripleo
-  params:
-  - ContainerZaqarConfigImage
-  - ContainerZaqarImage
-  services:
-  - OS::TripleO::Services::Zaqar
-
 - imagename: "{{ceph_namespace}}/{{ceph_image}}:{{ceph_tag}}"
   image_source: ceph
   params:

healthcheck/zaqar-api

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
-
-check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-zaqar_wsgi.conf)
-healthcheck_curl ${check_url}

healthcheck/zaqar-socket

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
-
-process=zaqar-server
-args="${@:-9000}"
-
-if healthcheck_listen $process $args; then
-    exit 0
-else
-    ports=${args// /,}
-    echo "There is no $process process, listening on port(s) $ports, running in the container."
-    exit 1
-fi
-

requirements.txt

@@ -21,7 +21,6 @@ passlib>=1.7.0 # BSD
 netifaces>=0.10.4 # MIT
 cryptography>=3.4.7 # BSD/Apache-2.0
 netaddr>=0.7.18 # BSD
-python-zaqarclient>=1.0.0 # Apache-2.0
 python-keystoneclient>=3.8.0 # Apache-2.0
 keystoneauth1>=3.4.0 # Apache-2.0
 tenacity>=6.1.0 # Apache-2.0

tripleo_common/constants.py

@@ -129,7 +129,6 @@ PASSWORD_PARAMETER_NAMES = (
     'SnmpdReadonlyUserPassword',
     'SwiftHashSuffix',
     'SwiftPassword',
-    'ZaqarPassword',
 )
 
 # List of passwords that should not be rotated by default using the

tripleo_common/tests/utils/test_plan.py

@@ -34,7 +34,6 @@ parameter_defaults:
   OvercloudControlFlavor: yummy
 passwords:
   AdminPassword: aaaa
-  ZaqarPassword: zzzz
 """
 
 USER_ENV_CONTENTS = """
@@ -79,7 +78,6 @@ _EXISTING_PASSWORDS = {
     'BarbicanSimpleCryptoKek': 'dGhpcnR5X3R3b19ieXRlX2tleWJsYWhibGFoYmxhaGg=',
     'AdminPassword': 'jFmY8FTpvtF2e4d4ReXvmUP8k',
     'CeilometerMeteringSecret': 'CbHTGK4md4Cc8P8ZyzTns6wry',
-    'ZaqarPassword': 'bbFgCTFbAH8vf9n3xvZCP8aMR',
     'NovaPassword': '7dZATgVPwD7Ergs9kTTDMCr7F',
     'MysqlRootPassword': 'VqJYpEdKks',
     'RabbitCookie': 'BqJYpEdKksAqJYpEdKks',
@@ -486,7 +484,6 @@ class PlanTest(base.TestCase):
             'BarbicanPassword',
             'AdminPassword',
             'CeilometerMeteringSecret',
-            'ZaqarPassword',
             'NovaPassword',
             'MysqlRootPassword'
         ]