openstack
/
openstack-ansible-os_tempest
Code Issues Proposed changes

Use tempest_keystone_interface_insecure var for ssl verification 

Currently keystone_service_internaluri_insecure var is used for
doing disabling/enabling ssl, but it comes from os_keystone role
which is not used at all places. It adds a dependency on
os_tempest role to set the value. Moving to a new var allows
use to define one less var in os_tempest.

Change-Id: Id20d13ed3138e39a14a3f8c6a9c11a6c3d3566df
This commit is contained in:
Chandan Kumar 2019-03-20 16:01:04 +05:30
parent 8794a6641b
commit e9bcf96cbf
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -217,6 +217,9 @@ tempest_volume_backend_names: [ backend1, backend2 ]
tempest_volume_backup_enabled: False
tempest_volume_multi_backend_enabled: False
# Var for setting ssl verification
tempest_keystone_interface_insecure: "{{ (keystone_service_internaluri_insecure | default(false)) | bool }}"
tempest_main_group: tempest_all
tempest_pip_packages:

24
tasks/tempest_resources.yml
View File

@ -56,7 +56,7 @@
os_image:
cloud: "{{ tempest_cloud_name }}"
interface: "{{ tempest_interface_name }}"
validate_certs: "{{ not (keystone_service_internaluri_insecure | bool) }}"
validate_certs: "{{ not (tempest_keystone_interface_insecure | bool) }}"
name: "{{ item.name | default(item.url | basename) }}"
filename: "{{ tempest_image_dir }}/{{ item.url | basename }}"
container_format: bare
@ -86,7 +86,7 @@
description: "{{ item }} project"
domain: "{{ tempest_domain_name }}"
interface: "{{ tempest_interface_name }}"
verify: "{{ not (keystone_service_internaluri_insecure | bool) }}"
verify: "{{ not (tempest_keystone_interface_insecure | bool) }}"
register: add_project
until: add_project is success
retries: 5
@ -102,7 +102,7 @@
domain: "{{ tempest_domain_name }}"
default_project: "{{ item.project | default(item.name) }}"
interface: "{{ tempest_interface_name }}"
verify: "{{ not (keystone_service_internaluri_insecure | bool) }}"
verify: "{{ not (tempest_keystone_interface_insecure | bool) }}"
register: add_user
until: add_user is success
retries: 5
@ -114,7 +114,7 @@
os_keystone_role:
cloud: "{{ tempest_cloud_name }}"
interface: "{{ tempest_interface_name }}"
validate_certs: "{{ not (keystone_service_internaluri_insecure | bool) }}"
validate_certs: "{{ not (tempest_keystone_interface_insecure | bool) }}"
name: "{{ item }}"
register: add_role
until: add_role is success
@ -130,7 +130,7 @@
role: "heat_stack_owner"
project: "{{ item.project | default(item.name) }}"
interface: "{{ tempest_interface_name }}"
verify: "{{ not (keystone_service_internaluri_insecure | bool) }}"
verify: "{{ not (tempest_keystone_interface_insecure | bool) }}"
register: add_user_role
until: add_user_role is success
retries: 5
@ -147,7 +147,7 @@
os_network:
cloud: "{{ tempest_cloud_name }}"
interface: "{{ tempest_interface_name }}"
validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
validate_certs: "{{ tempest_keystone_interface_insecure | ternary(false, true) }}"
name: "{{ tempest_private_net_name }}"
provider_network_type: "{{ tempest_private_net_provider_type }}"
provider_segmentation_id: "{{ tempest_private_net_seg_id | default(omit) }}"
@ -169,7 +169,7 @@
os_network:
cloud: "{{ tempest_cloud_name }}"
interface: "{{ tempest_interface_name }}"
validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
validate_certs: "{{ tempest_keystone_interface_insecure | ternary(false, true) }}"
name: "{{ tempest_public_net_name }}"
provider_network_type: "{{ tempest_public_net_provider_type }}"
provider_physical_network: "{{ tempest_public_net_physical_name | default(omit) }}"
@ -191,7 +191,7 @@
os_subnet:
cloud: "{{ tempest_cloud_name }}"
interface: "{{ tempest_interface_name }}"
validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
validate_certs: "{{ tempest_keystone_interface_insecure | ternary(false, true) }}"
network_name: "{{ tempest_private_net_name }}"
name: "{{ tempest_private_subnet_name }}"
cidr: "{{ tempest_private_subnet_cidr }}"
@ -208,7 +208,7 @@
os_subnet:
cloud: "{{ tempest_cloud_name }}"
interface: "{{ tempest_interface_name }}"
validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
validate_certs: "{{ tempest_keystone_interface_insecure | ternary(false, true) }}"
network_name: "{{ tempest_public_net_name }}"
name: "{{ tempest_public_subnet_name }}"
cidr: "{{ tempest_public_subnet_cidr }}"
@ -226,7 +226,7 @@
os_router:
cloud: "{{ tempest_cloud_name }}"
interface: "{{ tempest_interface_name }}"
validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
validate_certs: "{{ tempest_keystone_interface_insecure | ternary(false, true) }}"
name: router
network: "{{ tempest_public_net_name }}"
interfaces:
@ -250,7 +250,7 @@
os_nova_flavor:
cloud: "{{ tempest_cloud_name }}"
interface: "{{ tempest_interface_name }}"
validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
validate_certs: "{{ tempest_keystone_interface_insecure | ternary(false, true) }}"
name: "{{ item.name }}"
flavorid: "{{ item.id }}"
ram: "{{ item.ram }}"
@ -269,7 +269,7 @@
cloud: "{{ tempest_cloud_name }}"
name: admin
interface: "{{ tempest_interface_name }}"
validate_certs: "{{ not (keystone_service_internaluri_insecure | bool) }}"
validate_certs: "{{ not (tempest_keystone_interface_insecure | bool) }}"
register: _get_admin_project
until: _get_admin_project is success
retries: 5

2
templates/tempest.conf.j2
View File

@ -56,7 +56,7 @@ endpoint_type = internalURL
[identity]
disable_ssl_certificate_validation = {{ keystone_service_internaluri_insecure | bool }}
disable_ssl_certificate_validation = {{ tempest_keystone_interface_insecure | bool }}
uri = {{ keystone_service_internaluri }}/v2.0
uri_v3 = {{ keystone_service_internalurl }}
auth_version = v3