openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove tempest role"

Browse Source
This commit is contained in:
Zuul 2021-08-06 14:04:55 +00:00 committed by Gerrit Code Review
commit 295c69b5ee
25 changed files with 5 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.rst
View File

@ -69,7 +69,6 @@ Kolla Ansible deploys containers for the following OpenStack projects:
- `Solum <https://docs.openstack.org/solum/latest/>`__
- `Swift <https://docs.openstack.org/swift/latest/>`__
- `Tacker <https://docs.openstack.org/tacker/latest/>`__
- `Tempest <https://docs.openstack.org/tempest/latest/>`__
- `Trove <https://docs.openstack.org/trove/latest/>`__
- `Vitrage <https://docs.openstack.org/vitrage/latest/>`__
- `Vmtp <https://vmtp.readthedocs.io/en/latest/>`__

1
ansible/group_vars/all.yml
View File

@ -699,7 +699,6 @@ enable_swift_s3api: "no"
enable_swift_recon: "no"
enable_tacker: "no"
enable_telegraf: "no"
enable_tempest: "no"
enable_trove: "no"
enable_trove_singletenant: "no"
enable_vitrage: "no"

4
ansible/inventory/all-in-one
View File

@ -190,10 +190,6 @@ control
[vitrage:children]
control
# Tempest
[tempest:children]
control
[senlin:children]
control

4
ansible/inventory/multinode
View File

@ -208,10 +208,6 @@ control
[trove:children]
control
# Tempest
[tempest:children]
control
[senlin:children]
control

1
ansible/roles/common/tasks/config.yml
View File

@ -222,7 +222,6 @@
- { name: "storm", enabled: "{{ enable_storm | bool }}" }
- { name: "swift", enabled: "{{ enable_swift | bool }}" }
- { name: "tacker", enabled: "{{ enable_tacker | bool }}" }
- { name: "tempest", enabled: "{{ enable_tempest | bool }}" }
- { name: "trove", enabled: "{{ enable_trove | bool }}" }
- { name: "vitrage", enabled: "{{ enable_vitrage | bool }}" }
- { name: "watcher", enabled: "{{ enable_watcher | bool }}" }

3
ansible/roles/common/templates/cron-logrotate-tempest.conf.j2
View File

@ -1,3 +0,0 @@
"/var/log/kolla/tempest/*.log"
{
}

15
ansible/roles/tempest/handlers/main.yml
View File

@ -1,15 +0,0 @@
---
- name: Restart tempest container
vars:
service_name: "tempest"
service: "{{ tempest_services[service_name] }}"
become: true
kolla_docker:
action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

16
ansible/roles/tempest/tasks/check-containers.yml
View File

@ -1,16 +0,0 @@
---
- name: Check tempest containers
become: true
kolla_docker:
action: "compare_container"
common_options: "{{ docker_common_options }}"
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ tempest_services }}"
notify:
- "Restart {{ item.key }} container"

1
ansible/roles/tempest/tasks/check.yml
View File

@ -1 +0,0 @@
---

47
ansible/roles/tempest/tasks/config.yml
View File

@ -1,47 +0,0 @@
---
- name: Ensuring config directories exist
file:
path: "{{ node_config_directory }}/{{ item.key }}"
state: "directory"
owner: "{{ config_owner_user }}"
group: "{{ config_owner_group }}"
mode: "0770"
become: true
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ tempest_services }}"
- include_tasks: copy-certs.yml
when:
- kolla_copy_ca_into_containers | bool
- name: Copying over config.json files for services
template:
src: "{{ item.key }}.json.j2"
dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660"
become: true
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ tempest_services }}"
notify:
- Restart tempest container
- name: Copying over tempest.conf
vars:
project_name: "tempest"
merge_configs:
sources:
- "{{ role_path }}/templates/tempest.conf.j2"
- "{{ node_custom_config }}/tempest.conf"
dest: "{{ node_config_directory }}/{{ item.key }}/tempest.conf"
mode: "0660"
become: true
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ tempest_services }}"
notify:
- Restart tempest container

6
ansible/roles/tempest/tasks/copy-certs.yml
View File

@ -1,6 +0,0 @@
---
- name: "Copy certificates and keys for {{ project_name }}"
import_role:
role: service-cert-copy
vars:
project_services: "{{ tempest_services }}"

2
ansible/roles/tempest/tasks/deploy-containers.yml
View File

@ -1,2 +0,0 @@
---
- import_tasks: check-containers.yml

7
ansible/roles/tempest/tasks/deploy.yml
View File

@ -1,7 +0,0 @@
---
- import_tasks: config.yml
- import_tasks: check-containers.yml
- name: Flush handlers
meta: flush_handlers

7
ansible/roles/tempest/tasks/main.yml
View File

@ -1,7 +0,0 @@
---
- name: Warn about deprecation
debug:
msg: >
tempest role is deprecated and will be removed in Xena
- include_tasks: "{{ kolla_action }}.yml"

6
ansible/roles/tempest/tasks/precheck.yml
View File

@ -1,6 +0,0 @@
---
- import_role:
name: service-precheck
vars:
service_precheck_services: "{{ tempest_services }}"
service_name: "{{ project_name }}"

11
ansible/roles/tempest/tasks/pull.yml
View File

@ -1,11 +0,0 @@
---
- name: Pulling tempest image
become: true
kolla_docker:
action: "pull_image"
common_options: "{{ docker_common_options }}"
image: "{{ item.value.image }}"
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ tempest_services }}"

2
ansible/roles/tempest/tasks/reconfigure.yml
View File

@ -1,2 +0,0 @@
---
- import_tasks: deploy.yml

6
ansible/roles/tempest/tasks/stop.yml
View File

@ -1,6 +0,0 @@
---
- import_role:
name: service-stop
vars:
project_services: "{{ tempest_services }}"
service_name: "{{ project_name }}"

7
ansible/roles/tempest/tasks/upgrade.yml
View File

@ -1,7 +0,0 @@
---
- import_tasks: config.yml
- import_tasks: check-containers.yml
- name: Flush handlers
meta: flush_handlers

69
ansible/roles/tempest/templates/tempest.conf.j2
View File

@ -1,69 +0,0 @@
[DEFAULT]
debug = {{ openstack_logging_debug }}
log_file = tempest.log
use_stderr = False
log_dir = /var/log/kolla/tempest/
[auth]
admin_username = {{ openstack_auth.username }}
admin_password = {{ keystone_admin_password }}
admin_project_name = {{ openstack_auth.project_name }}
admin_domain_name = {{ openstack_auth.domain_name }}
[dashboard]
dashboard_url = {{ horizon_internal_endpoint }}
login_url = {{ horizon_internal_endpoint }}/auth/login/
[service_available]
cinder = {{ enable_cinder }}
neutron = {{ enable_neutron }}
glance = {{ enable_glance }}
swift = {{ enable_swift }}
nova = {{ enable_nova }}
heat = {{ enable_heat }}
horizon = {{ enable_horizon }}
ceilometer = {{ enable_ceilometer }}
[compute]
max_microversion = latest
image_ref = {{ tempest_image_id }}
image_ref_alt = {{ tempest_image_alt_id }}
flavor_ref = {{ tempest_flavor_ref_id }}
flavor_ref_alt = {{ tempest_flavor_ref_alt_id }}
region = {{ openstack_region_name }}
[identity]
region = {{ openstack_region_name }}
auth_version = v3
uri = {{ keystone_admin_url }}/v2.0
uri_v3 = {{ keystone_admin_url }}/v3
ca_certificates_file = {{ openstack_cacert }}
[image]
region = {{ openstack_region_name }}
http_image = {{ image_url }}
[image-feature-enabled]
api_v1 = False
[network]
region = {{ openstack_region_name }}
public_network_id = {{ tempest_public_network_id }}
floating_network_name = {{ tempest_floating_network_name }}
project_networks_reachable = false
[object-storage]
region = {{ openstack_region_name }}
[orchestration]
region = {{ openstack_region_name }}
[volume]
region = {{ openstack_region_name }}
[volume-feature-enabled]
api_v1 = True
[validation]
image_ssh_user = {{ tempest_image_ssh_user }}
image_ssh_password = {{ tempest_image_ssh_password }}

11
ansible/roles/tempest/templates/tempest.json.j2
View File

@ -1,11 +0,0 @@
{
"command": "sleep infinity",
"config_files":[
{
"source": "{{ container_config_directory }}/tempest.conf",
"dest": "/etc/tempest/tempest.conf",
"owner": "tempest",
"perm": "0600"
}
]
}

12
ansible/site.yml
View File

@ -73,7 +73,6 @@
- enable_swift_{{ enable_swift | bool }}
- enable_tacker_{{ enable_tacker | bool }}
- enable_telegraf_{{ enable_telegraf | bool }}
- enable_tempest_{{ enable_tempest | bool }}
- enable_trove_{{ enable_trove | bool }}
- enable_vitrage_{{ enable_vitrage | bool }}
- enable_vmtp_{{ enable_vmtp | bool }}
@ -929,17 +928,6 @@
tags: cyborg,
when: enable_cyborg | bool }
- name: Apply role tempest
gather_facts: false
hosts:
- tempest
- '&enable_tempest_True'
serial: '{{ kolla_serial|default("0") }}'
roles:
- { role: tempest,
tags: tempest,
when: enable_tempest | bool }
- name: Apply role designate
gather_facts: false
hosts:

14
etc/kolla/globals.yml
View File

@ -396,7 +396,6 @@
#enable_swift_s3api: "no"
#enable_tacker: "no"
#enable_telegraf: "no"
#enable_tempest: "no"
#enable_trove: "no"
#enable_trove_singletenant: "no"
#enable_vitrage: "no"
@ -677,19 +676,6 @@
# Rolling upgrade were enable by default
#swift_enable_rolling_upgrade: "yes"
################################################
# Tempest - The OpenStack Integration Test Suite
################################################
# The following values must be set when enabling tempest
#tempest_image_id:
#tempest_flavor_ref_id:
#tempest_public_network_id:
#tempest_floating_network_name:
# tempest_image_alt_id: "{{ tempest_image_id }}"
# tempest_flavor_ref_alt_id: "{{ tempest_flavor_ref_id }}"
###################################
# VMware - OpenStack VMware support
###################################

5
releasenotes/notes/remove-tempest-role-75faf53de1f1f56d.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``tempest`` project is not a service of OpenStack but its client.
Its images and support are removed since Xena cycle.

4
tests/templates/inventory.j2
View File

@ -264,10 +264,6 @@ control
[trove:children]
control
# Tempest
[tempest:children]
control
[senlin:children]
control