Os_tempest everywhere
Remove the logic to choose between validate-tempest and os_tempest. From now, only os_tempest should be executed. Also other changes in order to make it work properly: * Disable stackviz for CentOS-7 based distros. * In Queens, Auth_url ends with //v3 leading to auth issue, replacing it with /v3 fixes the issue. * Generate clouds.yaml only for overcloud. * Setting the CURL_CA_BUNDLE in order to avoid invalid ssl certificate errors Related-Bug: #1891372 Co-authored-by: Chandan Kumar (raukadah) <chkumar@redhat.com> Signed-off-by: Arx Cruz <arxcruz@redhat.com> Depends-On: https://review.opendev.org/#/c/759830/ Change-Id: I96808cc1d6c01391775a5f38d6dc27b6cf214afa
This commit is contained in:
parent
792f6216f6
commit
d202a61941
|
@ -44,6 +44,9 @@
|
|||
vars:
|
||||
tempest_install_method: distro
|
||||
tempest_cloud_name: 'overcloud'
|
||||
environment:
|
||||
# Disable ssl waarnings
|
||||
CURL_CA_BUNDLE: ""
|
||||
tags:
|
||||
- overcloud-validate
|
||||
|
||||
|
|
|
@ -106,5 +106,8 @@
|
|||
tempest_cidr: '192.168.24.0/24'
|
||||
tasks:
|
||||
- include_tasks: tasks/tempest.yml
|
||||
environment:
|
||||
# Disable ssl warnings
|
||||
CURL_CA_BUNDLE: ""
|
||||
tags:
|
||||
- standalone-upgrade
|
||||
|
|
|
@ -68,5 +68,8 @@
|
|||
- include_tasks: tasks/tempest.yml
|
||||
when: job is undefined or (job is defined and
|
||||
job.featureset is defined and job.featureset != '056')
|
||||
environment:
|
||||
# Disable ssl warnings
|
||||
CURL_CA_BUNDLE: ""
|
||||
tags:
|
||||
- standalone
|
||||
|
|
|
@ -30,6 +30,9 @@
|
|||
tempest_cidr: '192.168.24.0/24'
|
||||
tasks:
|
||||
- include_tasks: tasks/tempest.yml
|
||||
environment:
|
||||
# Disable ssl waarnings
|
||||
CURL_CA_BUNDLE: ""
|
||||
tags:
|
||||
- overcloud-validate
|
||||
- undercloud-validate
|
||||
|
|
|
@ -58,5 +58,8 @@
|
|||
tempest_cloud_name: 'standalone'
|
||||
tasks:
|
||||
- include_tasks: tasks/tempest.yml
|
||||
environment:
|
||||
# Disable ssl warnings
|
||||
CURL_CA_BUNDLE: ""
|
||||
tags:
|
||||
- standalone
|
||||
|
|
|
@ -25,6 +25,9 @@
|
|||
vars:
|
||||
tempest_install_method: distro
|
||||
tempest_cloud_name: 'overcloud'
|
||||
environment:
|
||||
# Disable ssl waarnings
|
||||
CURL_CA_BUNDLE: ""
|
||||
tags:
|
||||
- overcloud-validate
|
||||
|
||||
|
|
|
@ -57,6 +57,8 @@
|
|||
|
||||
- name: Create clouds.yaml if it doesn't exist
|
||||
shell: |
|
||||
# queens is returning //v3 so we replace with /v3
|
||||
sed -i 's/\/\/v3/\/v3/g' {{ ansible_user_dir }}/overcloudrc
|
||||
source {{ ansible_user_dir }}/overcloudrc
|
||||
mkdir -p {{ ansible_user_dir }}/.config/openstack
|
||||
cat <<EOF>>{{ ansible_user_dir }}/.config/openstack/clouds.yaml
|
||||
|
@ -74,8 +76,7 @@
|
|||
EOF
|
||||
when:
|
||||
- release in ['queens', 'rocky', 'stein']
|
||||
- use_os_tempest is defined
|
||||
- use_os_tempest | bool
|
||||
- not tempest_cloud_name in ['undercloud', 'standalone']
|
||||
|
||||
# Ansible requires openstacksdk>=0.12 do the resource setup, however
|
||||
# queens upper-constraint has openstacksdk==0.11.36, so we need to
|
||||
|
@ -101,14 +102,6 @@
|
|||
- 'openstacksdk'
|
||||
venv_wheel_build_enable: false
|
||||
|
||||
# This will execute the validate-tempest
|
||||
- name: Execute validate-tempest (deprecated)
|
||||
block:
|
||||
- name: Execute validate-tempest role
|
||||
include_role:
|
||||
name: validate-tempest
|
||||
when: run_tempest | bool
|
||||
|
||||
# This will execute os_tempest
|
||||
- name: Execute os_tempest
|
||||
block:
|
||||
|
@ -153,12 +146,12 @@
|
|||
- name: Set network vars
|
||||
set_fact:
|
||||
tempest_public_net_physical_type: 'datacentre'
|
||||
tempest_private_net_provider_type: "{{ (release in ['queens']) | ternary('vlan', 'geneve') }}"
|
||||
tempest_public_subnet_cidr: '{{ tempest_cidr }}'
|
||||
tempest_public_subnet_gateway_ip: '{{ tempest_cidr|nthhost(1) }}'
|
||||
tempest_public_subnet_allocation_pools: '{{ tempest_cidr|nthhost(100) ~ "-" ~ tempest_cidr|nthhost(150) }}'
|
||||
tempest_private_net_seg_id: "{{ (release in ['queens']) | ternary('', omit) }}"
|
||||
tempest_network_ping_gateway: true
|
||||
tempest_private_net_provider_type: "{{ (release in ['queens', 'rocky']) | ternary('vlan', 'geneve') }}"
|
||||
when: tempest_cidr is defined
|
||||
|
||||
- name: Handle migration of br-ex network
|
||||
|
@ -220,9 +213,7 @@
|
|||
set_fact:
|
||||
tempest_run_stackviz: false
|
||||
when:
|
||||
- release|default('master') in ['master', 'queens', 'stein', 'train']
|
||||
- ansible_distribution|lower in ['redhat', 'centos']
|
||||
- ansible_distribution_major_version is version('7', '=')
|
||||
- ansible_distribution_major_version is version('8', '<')
|
||||
|
||||
- name: Run os_tempest role
|
||||
vars:
|
||||
|
@ -231,7 +222,4 @@
|
|||
tempest_run: 'yes'
|
||||
include_role:
|
||||
name: os_tempest
|
||||
when:
|
||||
- not run_tempest | bool
|
||||
- use_os_tempest is defined
|
||||
- use_os_tempest | bool
|
||||
when: use_os_tempest | default(true)
|
||||
|
|
Loading…
Reference in New Issue