Merge "Deprecate unnecessary variables"
This commit is contained in:
commit
2402146bf7
|
@ -181,16 +181,11 @@ tempest_test_extra_test: []
|
|||
# Defaults to tempest_test_blacklist for backwards compatibility and migration purposes.
|
||||
tempest_test_excludelist: "{{ tempest_test_blacklist | default([]) }}"
|
||||
|
||||
# Toggle fatal deprecations
|
||||
tempest_fatal_deprecations: False
|
||||
|
||||
# Private network configuration
|
||||
# Currently supports 2 types
|
||||
# vlan - will need to make sure your seg id and subnet cidr are correct
|
||||
# vxlan - default, can change subnet cidr and seg id
|
||||
|
||||
# This needs to coincide with tempest_network_tenant_network_cidr and
|
||||
# tempest_network_tenant_network_mask_bits below
|
||||
tempest_private_net_name: "private"
|
||||
tempest_private_subnet_name: "private-subnet"
|
||||
tempest_private_subnet_cidr: "192.168.74.0/28"
|
||||
|
@ -227,8 +222,6 @@ tempest_compute_console_output_enabled: True
|
|||
tempest_compute_resize_enabled: True
|
||||
tempest_compute_snapshot_enabled: True
|
||||
tempest_compute_change_password: False
|
||||
tempest_network_tenant_network_cidr: "192.168.74.0/24"
|
||||
tempest_network_tenant_network_mask_bits: 28
|
||||
tempest_network_ping_gateway: False
|
||||
|
||||
tempest_dashboard_url: "https://{{ external_lb_vip_address | default('127.0.0.1') }}/"
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
deprecations:
|
||||
- variable ``tempest_network_tenant_network_cidr`` has been deprecated
|
||||
- variable ``tempest_network_tenant_network_mask_bits`` has been deprecated
|
||||
- variable ``tempest_fatal_deprecations`` has been deprecated
|
||||
|
|
@ -4,7 +4,6 @@
|
|||
# Disable stderr logging
|
||||
use_stderr = False
|
||||
debug = {{ debug }}
|
||||
fatal_deprecations = {{ tempest_fatal_deprecations }}
|
||||
log_file = {{ tempest_log_dir}}/tempest.log
|
||||
|
||||
|
||||
|
@ -92,8 +91,6 @@ api_v2 = {{ tempest_image_api_v2_enabled }}
|
|||
|
||||
[network]
|
||||
endpoint_type = internalURL
|
||||
project_network_cidr = {{ tempest_network_tenant_network_cidr }}
|
||||
project_network_mask_bits = {{ tempest_network_tenant_network_mask_bits }}
|
||||
project_networks_reachable = false
|
||||
public_network_id = {{ tempest_neutron_public_network_id }}
|
||||
floating_network_name = {{ tempest_public_net_name }}
|
||||
|
|
Loading…
Reference in New Issue