From 03ab541473df62492eec81148babe00ed7aa2be9 Mon Sep 17 00:00:00 2001
From: Martin Kopec <mkopec@redhat.com>
Date: Mon, 2 Jul 2018 09:20:42 +0000
Subject: [PATCH] Remove default-overrides.conf

Remove the file completely.

Change-Id: Ibec27eaa1212a0b46d66be0c97869419849f4cb7
---
 config_tempest/main.py     | 2 +-
 etc/default-overrides.conf | 3 ---
 setup.cfg                  | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 etc/default-overrides.conf

diff --git a/config_tempest/main.py b/config_tempest/main.py
index a9dbd7ca..c3d8f204 100755
--- a/config_tempest/main.py
+++ b/config_tempest/main.py
@@ -175,7 +175,7 @@ def set_options(conf, deployer_input, non_admin, overrides=[],
 
     if non_admin:
         # non admin, so delete auth admin values which were set
-        # from default-overides.conf file
+        # in load_basic_defaults method
         conf.set("auth", "admin_username", "")
         conf.set("auth", "admin_project_name", "")
         conf.set("auth", "admin_password", "")
diff --git a/etc/default-overrides.conf b/etc/default-overrides.conf
deleted file mode 100644
index 7b23b211..00000000
--- a/etc/default-overrides.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# The content of the file was moved to the source
-# code of python-tempestconf.
-# The file will removed soon.
diff --git a/setup.cfg b/setup.cfg
index e79f5379..061b7005 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,9 +23,6 @@ classifier =
 packages =
     config_tempest
 
-data_files =
-    etc/tempest = etc/*
-
 [entry_points]
 console_scripts =
     discover-tempest-config = config_tempest.main:main