Add 'tempest_tempestconf_profile_overrides' to tempest profile

This patch updates some featureset configuration files that are
defining 'tempest_tempestconf_profile' with overrides set to
'tempest_tempest_conf_overrides'. Since [1], a new var was added
to hold tempestconf profile overrides. This patch combines
both 'tempest_tempestconf_profile_overrides' and
'tempest_tempest_conf_overrides' to define tempestconf profile
overrides, since lots of jobs definitions still use
'tempest_tempest_conf_overrides'.
This fix is needed since these configuration files are currently
defining 'tempest_tempestconf_profile', see [2].

[1] 1003438006
[2] 1003438006/defaults/main.yml (L319-L325)

Change-Id: I86289df6d6480405b7b6e0ee7028978f6c9a4ab7
Signed-off-by: Douglas Viroel <dviroel@redhat.com>

config/environments/standalone_centos_libvirt.yml

@@ -62,7 +62,7 @@ tempest_tempestconf_profile:
     os-cloud: "{{ tempest_cloud_name }}"
     out: "{{ tempest_workspace }}/etc/tempest.conf"
     network-id: "{{ tempest_neutron_public_network_id }}"
-    overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
+    overrides: "{{ tempest_tempest_conf_overrides | default({}) | combine(tempest_tempestconf_profile_overrides | default({}), recursive=True) }}"
 
 # looking for a small set of tempest tests to validate
 # tempest config and execution are working

config/general_config/featureset001.yml

@@ -129,7 +129,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) | combine(tempest_tempestconf_profile_overrides | default({}), recursive=True) }}"
 
 tempest_tempest_conf_overrides:
   auth.use_dynamic_credentials: 'True'

config/general_config/featureset002.yml

@@ -153,7 +153,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) | combine(tempest_tempestconf_profile_overrides | default({}), recursive=True) }}"
 
 tempest_check_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps'

config/general_config/featureset020.yml

@@ -231,7 +231,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) | combine(tempest_tempestconf_profile_overrides | default({}), recursive=True) }}"
 
 check_test_whitelist:
   - 'tempest.scenario'

config/general_config/featureset021.yml

@@ -200,7 +200,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) | combine(tempest_tempestconf_profile_overrides | default({}), recursive=True) }}"
 
 # Run skiplist as whitelist
 tempest_test_whitelist: "{{ tempest_whitelist }}"

config/general_config/featureset030.yml

@@ -131,6 +131,6 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) | combine(tempest_tempestconf_profile_overrides | default({}), recursive=True) }}"
 
 tempest_test_whitelist: "{{ tempest_whitelist }}"

config/general_config/featureset035.yml

@@ -185,7 +185,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) | combine(tempest_tempestconf_profile_overrides | default({}), recursive=True) }}"
 
 tempest_tempest_conf_overrides:
   auth.use_dynamic_credentials: 'True'

config/general_config/featureset039.yml

@@ -178,7 +178,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) | combine(tempest_tempestconf_profile_overrides | default({}), recursive=True) }}"
 
 test_white_regex: ''
 tempest_whitelist:

config/general_config/featureset064.yml

@@ -117,7 +117,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) | combine(tempest_tempestconf_profile_overrides | default({}), recursive=True) }}"
 
 test_white_regex: ''
 tempest_whitelist:

config/general_config/minimal.yml

@@ -176,7 +176,7 @@ tempest_tempestconf_profile:
   os-cloud: "{{ tempest_cloud_name }}"
   out: "{{ tempest_workspace }}/etc/tempest.conf"
   network-id: "{{ tempest_neutron_public_network_id }}"
-  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) | combine(tempest_tempestconf_profile_overrides | default({}), recursive=True) }}"
 
 # looking for a small set of tempest tests to validate
 # tempest config and execution are working