Merge "Os_tempest everywhere"
This commit is contained in:
commit
deef6e9641
|
@ -44,6 +44,9 @@
|
||||||
vars:
|
vars:
|
||||||
tempest_install_method: distro
|
tempest_install_method: distro
|
||||||
tempest_cloud_name: 'overcloud'
|
tempest_cloud_name: 'overcloud'
|
||||||
|
environment:
|
||||||
|
# Disable ssl waarnings
|
||||||
|
CURL_CA_BUNDLE: ""
|
||||||
tags:
|
tags:
|
||||||
- overcloud-validate
|
- overcloud-validate
|
||||||
|
|
||||||
|
|
|
@ -106,5 +106,8 @@
|
||||||
tempest_cidr: '192.168.24.0/24'
|
tempest_cidr: '192.168.24.0/24'
|
||||||
tasks:
|
tasks:
|
||||||
- include_tasks: tasks/tempest.yml
|
- include_tasks: tasks/tempest.yml
|
||||||
|
environment:
|
||||||
|
# Disable ssl warnings
|
||||||
|
CURL_CA_BUNDLE: ""
|
||||||
tags:
|
tags:
|
||||||
- standalone-upgrade
|
- standalone-upgrade
|
||||||
|
|
|
@ -68,5 +68,8 @@
|
||||||
- include_tasks: tasks/tempest.yml
|
- include_tasks: tasks/tempest.yml
|
||||||
when: job is undefined or (job is defined and
|
when: job is undefined or (job is defined and
|
||||||
job.featureset is defined and job.featureset != '056')
|
job.featureset is defined and job.featureset != '056')
|
||||||
|
environment:
|
||||||
|
# Disable ssl warnings
|
||||||
|
CURL_CA_BUNDLE: ""
|
||||||
tags:
|
tags:
|
||||||
- standalone
|
- standalone
|
||||||
|
|
|
@ -30,6 +30,9 @@
|
||||||
tempest_cidr: '192.168.24.0/24'
|
tempest_cidr: '192.168.24.0/24'
|
||||||
tasks:
|
tasks:
|
||||||
- include_tasks: tasks/tempest.yml
|
- include_tasks: tasks/tempest.yml
|
||||||
|
environment:
|
||||||
|
# Disable ssl waarnings
|
||||||
|
CURL_CA_BUNDLE: ""
|
||||||
tags:
|
tags:
|
||||||
- overcloud-validate
|
- overcloud-validate
|
||||||
- undercloud-validate
|
- undercloud-validate
|
||||||
|
|
|
@ -58,5 +58,8 @@
|
||||||
tempest_cloud_name: 'standalone'
|
tempest_cloud_name: 'standalone'
|
||||||
tasks:
|
tasks:
|
||||||
- include_tasks: tasks/tempest.yml
|
- include_tasks: tasks/tempest.yml
|
||||||
|
environment:
|
||||||
|
# Disable ssl warnings
|
||||||
|
CURL_CA_BUNDLE: ""
|
||||||
tags:
|
tags:
|
||||||
- standalone
|
- standalone
|
||||||
|
|
|
@ -25,6 +25,9 @@
|
||||||
vars:
|
vars:
|
||||||
tempest_install_method: distro
|
tempest_install_method: distro
|
||||||
tempest_cloud_name: 'overcloud'
|
tempest_cloud_name: 'overcloud'
|
||||||
|
environment:
|
||||||
|
# Disable ssl waarnings
|
||||||
|
CURL_CA_BUNDLE: ""
|
||||||
tags:
|
tags:
|
||||||
- overcloud-validate
|
- overcloud-validate
|
||||||
|
|
||||||
|
|
|
@ -57,6 +57,8 @@
|
||||||
|
|
||||||
- name: Create clouds.yaml if it doesn't exist
|
- name: Create clouds.yaml if it doesn't exist
|
||||||
shell: |
|
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
|
source {{ ansible_user_dir }}/overcloudrc
|
||||||
mkdir -p {{ ansible_user_dir }}/.config/openstack
|
mkdir -p {{ ansible_user_dir }}/.config/openstack
|
||||||
cat <<EOF>>{{ ansible_user_dir }}/.config/openstack/clouds.yaml
|
cat <<EOF>>{{ ansible_user_dir }}/.config/openstack/clouds.yaml
|
||||||
|
@ -74,8 +76,7 @@
|
||||||
EOF
|
EOF
|
||||||
when:
|
when:
|
||||||
- release in ['queens', 'rocky', 'stein']
|
- release in ['queens', 'rocky', 'stein']
|
||||||
- use_os_tempest is defined
|
- not tempest_cloud_name in ['undercloud', 'standalone']
|
||||||
- use_os_tempest | bool
|
|
||||||
|
|
||||||
# Ansible requires openstacksdk>=0.12 do the resource setup, however
|
# Ansible requires openstacksdk>=0.12 do the resource setup, however
|
||||||
# queens upper-constraint has openstacksdk==0.11.36, so we need to
|
# queens upper-constraint has openstacksdk==0.11.36, so we need to
|
||||||
|
@ -101,14 +102,6 @@
|
||||||
- 'openstacksdk'
|
- 'openstacksdk'
|
||||||
venv_wheel_build_enable: false
|
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
|
# This will execute os_tempest
|
||||||
- name: Execute os_tempest
|
- name: Execute os_tempest
|
||||||
block:
|
block:
|
||||||
|
@ -153,12 +146,12 @@
|
||||||
- name: Set network vars
|
- name: Set network vars
|
||||||
set_fact:
|
set_fact:
|
||||||
tempest_public_net_physical_type: 'datacentre'
|
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_cidr: '{{ tempest_cidr }}'
|
||||||
tempest_public_subnet_gateway_ip: '{{ tempest_cidr|nthhost(1) }}'
|
tempest_public_subnet_gateway_ip: '{{ tempest_cidr|nthhost(1) }}'
|
||||||
tempest_public_subnet_allocation_pools: '{{ tempest_cidr|nthhost(100) ~ "-" ~ tempest_cidr|nthhost(150) }}'
|
tempest_public_subnet_allocation_pools: '{{ tempest_cidr|nthhost(100) ~ "-" ~ tempest_cidr|nthhost(150) }}'
|
||||||
tempest_private_net_seg_id: "{{ (release in ['queens']) | ternary('', omit) }}"
|
tempest_private_net_seg_id: "{{ (release in ['queens']) | ternary('', omit) }}"
|
||||||
tempest_network_ping_gateway: true
|
tempest_network_ping_gateway: true
|
||||||
|
tempest_private_net_provider_type: "{{ (release in ['queens', 'rocky']) | ternary('vlan', 'geneve') }}"
|
||||||
when: tempest_cidr is defined
|
when: tempest_cidr is defined
|
||||||
|
|
||||||
- name: Handle migration of br-ex network
|
- name: Handle migration of br-ex network
|
||||||
|
@ -220,9 +213,7 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
tempest_run_stackviz: false
|
tempest_run_stackviz: false
|
||||||
when:
|
when:
|
||||||
- release|default('master') in ['master', 'queens', 'stein', 'train']
|
- ansible_distribution_major_version is version('8', '<')
|
||||||
- ansible_distribution|lower in ['redhat', 'centos']
|
|
||||||
- ansible_distribution_major_version is version('7', '=')
|
|
||||||
|
|
||||||
- name: Run os_tempest role
|
- name: Run os_tempest role
|
||||||
vars:
|
vars:
|
||||||
|
@ -231,7 +222,4 @@
|
||||||
tempest_run: 'yes'
|
tempest_run: 'yes'
|
||||||
include_role:
|
include_role:
|
||||||
name: os_tempest
|
name: os_tempest
|
||||||
when:
|
when: use_os_tempest | default(true)
|
||||||
- not run_tempest | bool
|
|
||||||
- use_os_tempest is defined
|
|
||||||
- use_os_tempest | bool
|
|
||||||
|
|
Loading…
Reference in New Issue