From 4d7021d93f9911eccf40b17032f5412ddd0f042c Mon Sep 17 00:00:00 2001
From: Martin Kopec <mkopec@redhat.com>
Date: Mon, 30 Mar 2020 18:58:39 +0000
Subject: [PATCH] Fix default value of tempestconf overrides

The current default value is literraly 'omit' which is incorrect.
If a users doesn't have any intention to override any tempestconf
values, the overrides should be an empty dict or not set at all [1].

The review sets the default value of tempestconf overrides to
an empty dict as shown in the doc [1].

[1] https://docs.openstack.org/python-tempestconf/latest/user/profile.html

Change-Id: Ifd791bae7982154fd097774a3992530675278345
---
 config/general_config/featureset001.yml | 2 +-
 config/general_config/featureset020.yml | 2 +-
 config/general_config/featureset021.yml | 2 +-
 config/general_config/featureset030.yml | 2 +-
 config/general_config/featureset035.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml
index 01d8a0d99..d7c642172 100644
--- a/config/general_config/featureset001.yml
+++ b/config/general_config/featureset001.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('omit') }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
 
 tempest_tempest_conf_overrides:
   auth.use_dynamic_credentials: 'True'
diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml
index fd12e66f3..15839ba9c 100644
--- a/config/general_config/featureset020.yml
+++ b/config/general_config/featureset020.yml
@@ -205,7 +205,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('omit') }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
 
 check_test_whitelist:
   - 'tempest.scenario'
diff --git a/config/general_config/featureset021.yml b/config/general_config/featureset021.yml
index e05585ebb..51a8ad431 100644
--- a/config/general_config/featureset021.yml
+++ b/config/general_config/featureset021.yml
@@ -226,7 +226,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('omit') }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
 
 # Run skiplist as whitelist
 tempest_test_whitelist: "{{ tempest_whitelist }}"
diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
index 7eda22721..5886029fc 100644
--- a/config/general_config/featureset030.yml
+++ b/config/general_config/featureset030.yml
@@ -142,6 +142,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('omit') }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
 
 tempest_test_whitelist: "{{ tempest_whitelist }}"
diff --git a/config/general_config/featureset035.yml b/config/general_config/featureset035.yml
index 0bfbc4aec..85de11a3f 100644
--- a/config/general_config/featureset035.yml
+++ b/config/general_config/featureset035.yml
@@ -190,7 +190,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('omit') }}"
+  overrides: "{{ tempest_tempest_conf_overrides | default({}) }}"
 
 tempest_tempest_conf_overrides:
   auth.use_dynamic_credentials: 'True'