Merge "Added tempest_tempestconf_profile_ specific vars"

defaults/main.yml

@@ -322,7 +322,9 @@ 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('omit') }}"
+  overrides: "{{ tempest_tempestconf_profile_overrides }}"
+tempest_tempestconf_profile_extras: {}
+tempest_tempestconf_profile_overrides: "{{ tempest_tempest_conf_overrides }}"
 
 # Stackviz tarball url
 stackviz_pip_install_args: "{{ pip_install_options | default('--isolated') }}"

releasenotes/notes/tempestconf-extras-38a14ff705161872.yaml

@@ -0,0 +1,14 @@
+---
+features:
+  - |
+    Adds new variable `tempest_tempestconf_profile_extras` which allows
+    to extend `tempest_tempestconf_profile` dictionary without need to
+    override all existing keys. `tempest_tempestconf_profile_extras` has
+    presedence over `tempest_tempestconf_profile`. For example, it may be
+    used to define extra image or it's format.
+fixes:
+  - |
+    Usage of tempest_tempest_conf_overrides, where it could have 2 different
+    formats. one for config_template and another one for tempestconf.profile
+    Now for tempestconf.profile overrides `tempest_tempestconf_profile_overrides`
+    variable should be used.

tasks/tempestconf.yml

@@ -25,7 +25,7 @@
 
 - name: Override tempestconf profile
   copy:
-    content: "{{ tempest_tempestconf_profile | to_nice_yaml }}"
+    content: "{{ tempest_tempestconf_profile | combine(tempest_tempestconf_profile_extras) | to_nice_yaml }}"
     dest: "{{ tempest_workspace }}/etc/profile.yaml"
 
 - name: Executing python-tempestconf