openstack/openstack-ansible-os_tempest
Code Issues Proposed changes

Updates Tempest.conf.j2

Browse Source 
Some options inside the tempest configuration template
have been deprecated. This patch updates the
configuration options in the tempest.conf.j2 file.

Change-Id: I45089992049086300994663e7a088799738dcaf8
Closes-Bug: #1642749
This commit is contained in:
Jonte Watford 2016-11-17 22:06:22 +00:00
parent f73a8dc279
commit 9a42e0c707
1 changed files with 14 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
templates/tempest.conf.j2
View File

@ -13,18 +13,15 @@ tempest_roles = remote_image
use_dynamic_credentials = True use_dynamic_credentials = True
default_credentials_domain_name = Default default_credentials_domain_name = Default
admin_domain_name = Default admin_domain_name = Default
admin_username = {{ keystone_admin_user_name }}
admin_project_name = {{ keystone_admin_tenant_name }}
admin_password = {{ keystone_auth_admin_password }}
[baremetal] [baremetal]
endpoint_type = internalURL endpoint_type = internalURL
[cli]
enabled = true
cli_dir = /usr/local/bin
has_manage = false
timeout = 15
[compute] [compute]
image_ref = {{ tempest_glance_image_id }} image_ref = {{ tempest_glance_image_id }}
image_ref_alt = {{ tempest_glance_image_alt_id }} image_ref_alt = {{ tempest_glance_image_alt_id }}
@ -32,7 +29,6 @@ flavor_ref = 201
flavor_ref_alt = 202 flavor_ref_alt = 202
fixed_network_name = private fixed_network_name = private
endpoint_type = internalURL endpoint_type = internalURL
floating_ip_range = 10.0.0.0/29
[compute-feature-enabled] [compute-feature-enabled]
@ -52,18 +48,9 @@ interface_attach = false
snapshot = {{ tempest_compute_resize_enabled }} snapshot = {{ tempest_compute_resize_enabled }}
[dashboard]
login_url = {{ tempest_dashboard_login_url }}
dashboard_url = {{ tempest_dashboard_url }}
[data_processing] [data_processing]
endpoint_type = internalURL endpoint_type = internalURL
[database]
[debug] [debug]
@ -75,19 +62,7 @@ auth_version = v3
v2_admin_endpoint_type = adminURL v2_admin_endpoint_type = adminURL
v2_public_endpoint_type = internalURL v2_public_endpoint_type = internalURL
v3_endpoint_type = adminURL v3_endpoint_type = adminURL
endpoint_type = internalURL
username = demo
tenant_name = demo
admin_role = admin admin_role = admin
password = demo
domain_name = Default
alt_username = alt_demo
alt_tenant_name = alt_demo
alt_password = alt_demo
alt_domain_name = Default
admin_username = {{ keystone_admin_user_name }}
admin_tenant_name = {{ keystone_admin_tenant_name }}
admin_password = {{ keystone_auth_admin_password }}
[identity-feature-enabled] [identity-feature-enabled]
@ -106,7 +81,6 @@ api_v2 = {{ tempest_image_api_v2_enabled }}
[input-scenario] [input-scenario]
[messaging] [messaging]
@ -115,9 +89,9 @@ api_v2 = {{ tempest_image_api_v2_enabled }}
[network] [network]
endpoint_type = internalURL endpoint_type = internalURL
tenant_network_cidr = {{ tempest_network_tenant_network_cidr }} project_network_cidr = {{ tempest_network_tenant_network_cidr }}
tenant_network_mask_bits = {{ tempest_network_tenant_network_mask_bits }} project_network_mask_bits = {{ tempest_network_tenant_network_mask_bits }}
tenant_networks_reachable = false project_networks_reachable = false
public_network_id = {{ tempest_neutron_public_network_id }} public_network_id = {{ tempest_neutron_public_network_id }}
floating_network_name = public floating_network_name = public
@ -130,7 +104,7 @@ api_extensions = agent,allowed-address-pairs,binding,dhcp_agent_scheduler,ext-gw
[object-storage] [object-storage]
endpoint_type = internalURL endpoint_type = internalURL
operator_role = swiftoperator operator_role = swiftoperator
reseller_admin_role = reseller_admin reseller_admin_role = ResellerAdmin
[object-storage-feature-enabled] [object-storage-feature-enabled]
@ -163,15 +137,12 @@ swift = {{ tempest_service_available_swift }}
nova = {{ tempest_service_available_nova }} nova = {{ tempest_service_available_nova }}
heat = {{ tempest_service_available_heat }} heat = {{ tempest_service_available_heat }}
ceilometer = {{ tempest_service_available_ceilometer }} ceilometer = {{ tempest_service_available_ceilometer }}
ironic = {{ tempest_service_available_ironic }}
horizon = {{ tempest_service_available_horizon }} horizon = {{ tempest_service_available_horizon }}
aodh = {{ tempest_service_available_aodh }} aodh = {{ tempest_service_available_aodh }}
ironic = {{ tempest_service_available_ironic }}
sahara = {{ tempest_service_available_sahara }} sahara = {{ tempest_service_available_sahara }}
zaqar = {{ tempest_service_available_zaqar }} zaqar = {{ tempest_service_available_zaqar }}
[stress]
[telemetry] [telemetry]
endpoint_type = internalURL endpoint_type = internalURL
@ -179,17 +150,19 @@ endpoint_type = internalURL
[alarming] [alarming]
endpoint_type = internalURL endpoint_type = internalURL
[validation] [validation]
run_validation = {{ tempest_compute_run_ssh }} run_validation = {{ tempest_compute_run_ssh }}
auth_method = keypair auth_method = keypair
image_ssh_user = {{ tempest_compute_image_ssh_user }} image_ssh_user = {{ tempest_compute_image_ssh_user }}
floating_ip_range = 10.0.0.0/29
[volume] [volume]
endpoint_type = internalURL endpoint_type = internalURL
# NOTE: These backends are only tested when multi_backend is enabled # NOTE: These backends are only tested when multi_backend is enabled
backend1_name = {{ tempest_volume_backend1_name }} backend1 = {{ tempest_volume_backend1_name }}
backend2_name = {{ tempest_volume_backend2_name }} backend2 = {{ tempest_volume_backend2_name }}
backend_names = [ backend1, backend2 ]
[volume-feature-enabled] [volume-feature-enabled]