Merge "Remove tempest container support from tht"

This commit is contained in:
Zuul 2021-03-15 21:05:28 +00:00 committed by Gerrit Code Review
commit b28bd70323
4 changed files with 8 additions and 71 deletions

View File

@ -1,67 +0,0 @@
heat_template_version: rocky
description: >
OpenStack containerized Tempest
parameters:
ContainerTempestImage:
description: image
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
ServiceData:
default: {}
description: Dictionary packing service data
type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
outputs:
role_data:
description: Role data for the tempest service
value:
# It just adds a fake tempest service so that it will be
# available on undercloud.
service_name: tempest
docker_config:
step_2:
tempest_init_logs:
image: &tempest_image {get_param: ContainerTempestImage}
net: none
privileged: false
user: root
volumes:
- /var/log/containers/tempest:/var/log/tempest:z
- /var/lib/tempestdata:/var/lib/tempest:z
command: ['/bin/bash', '-c', 'chown -R tempest:tempest /var/log/tempest /var/lib/tempest']
host_prep_tasks:
- name: create persistent directories
file:
path: "{{ item.path }}"
state: directory
setype: "{{ item.setype }}"
mode: "{{ item.mode|default(omit) }}"
with_items:
- { 'path': /var/log/containers/tempest, 'setype': container_file_t, 'mode': '0750' }
- { 'path': /var/lib/tempestdata, 'setype': container_file_t }
- { 'path': /var/lib/tempest, 'setype': container_file_t }
puppet_config:
config_volume: ''
step_config: ''
config_image: {get_param: ContainerTempestImage}
config_settings: {}

View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::Tempest: ../deployment/undercloud/tempest-container-puppet.yaml

View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::Tempest: ../../deployment/undercloud/tempest-container-puppet.yaml

View File

@ -0,0 +1,8 @@
---
removal:
- |
Support of Tempest container is removed in favor of os_tempest
ansible role.
As it is no longer tested by the CI team and not used anywhere.
Since tempest is a standalone OpenStack validation tool, can be
used via installing through rpm package, which is fully supported.