Merge "Define tempest config overrides in unique variables per service"

tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2

@@ -153,7 +153,7 @@ tempest_test_includelist:
   - "neutron_tempest_plugin.api.test_networks*"
   - "tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops"
 
-tempest_tempest_conf_overrides:
+tempest_tempest_conf_overrides_neutron:
   network-feature-enabled:
     api_extensions: agent,allowed-address-pairs,binding,dhcp_agent_scheduler,ext-gw-mode,external-net,extra_dhcp_opt,extra_dhcp_optagent,extraroute,l3_agent_scheduler,metering,provider,quotas,router,security-group,service-type,subnet_allocation
 {% endif %}

tests/roles/bootstrap-host/templates/user_variables_horizon.yml.j2

@@ -16,6 +16,6 @@
 tempest_test_includelist:
   - tempest.scenario.test_dashboard_basic_ops.TestDashboardBasicOps
 
-tempest_tempest_conf_overrides:
+tempest_tempest_conf_overrides_horizon:
   dashboard:
     disable_ssl_certificate_validation: True

tests/roles/bootstrap-host/templates/user_variables_magnum.yml.j2

@@ -58,7 +58,7 @@ tempest_test_excludelist:
   - magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_nonexisting_flavor
   - magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_zero_nodes
 
-tempest_tempest_conf_overrides:
+tempest_tempest_conf_overrides_magnum:
   magnum:
     coe: kubernetes
     network_driver: flannel

tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2

@@ -30,7 +30,7 @@ tempest_flavors:
 tempest_test_includelist:
   - manila_tempest_tests.tests.scenario.test_share_basic_ops.TestShareBasicOpsNFS.test_mount_share_one_vm
 
-tempest_tempest_conf_overrides:
+tempest_tempest_conf_overrides_manila:
   share:
     # The first version of manila api which supports microversions
     min_api_microversion: "2.0"

tests/roles/bootstrap-host/templates/user_variables_murano.yml.j2

@@ -16,7 +16,7 @@
 tempest_test_includelist:
   - murano_tempest_tests.tests.api.application_catalog.test_services
 
-tempest_tempest_conf_overrides:
+tempest_tempest_conf_overrides_murano:
   application_catalog:
     deployment_tests: True
     endpoint_type: internalURL

tests/roles/bootstrap-host/templates/user_variables_octavia.yml.j2

@@ -27,7 +27,7 @@ octavia_legacy_policy: True
 octavia_amp_vcpu: 2
 octavia_amp_ram: 512
 tempest_service_available_octavia: true
-tempest_tempest_conf_overrides:
+tempest_tempest_conf_overrides_octavia:
   load_balancer:
     member_role: '"Member"'
     test_with_ipv6: false

tests/roles/bootstrap-host/templates/user_variables_zun.yml.j2

@@ -24,6 +24,6 @@ tempest_test_excludelist:
   - test: zun_tempest_plugin.tests.tempest.api.test_containers.TestContainer.test_run_container_with_cinder_volume_dynamic_created
     reason: Cinder volume error
 
-tempest_tempest_conf_overrides:
+tempest_tempest_conf_overrides_zun:
   container_service:
     min_microversion: 1.27