diff --git a/defaults/main.yml b/defaults/main.yml index 83d4ea0b..816438f0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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') }}/" diff --git a/releasenotes/notes/remove-unnecessary-vars-2b29b9fd5c7ac06a.yaml b/releasenotes/notes/remove-unnecessary-vars-2b29b9fd5c7ac06a.yaml new file mode 100644 index 00000000..d29f0908 --- /dev/null +++ b/releasenotes/notes/remove-unnecessary-vars-2b29b9fd5c7ac06a.yaml @@ -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 + diff --git a/templates/tempest.conf.j2 b/templates/tempest.conf.j2 index 8a32914f..fd81290e 100644 --- a/templates/tempest.conf.j2 +++ b/templates/tempest.conf.j2 @@ -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 }}