ftests: Remove unused config files

Remove references to default.conf and tmp.conf.  When the ftests
switched from LXC to LXD, these files became no longer needed.

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>

diff --git a/ftests/consts.py b/ftests/consts.py
index f1621b4c02d209144c533cba52d4fc9ac5ac1060..208f3a003654afbcbbe00c5cedcc78553fd5d828 100644 (file)
--- a/ftests/consts.py
+++ b/ftests/consts.py
@@ -37,10 +37,6 @@ DEFAULT_CONTAINER_DISTRO = 'ubuntu'
 DEFAULT_CONTAINER_RELEASE = '18.04'
 DEFAULT_CONTAINER_ARCH = 'amd64'
 DEFAULT_CONTAINER_STOP_TIMEOUT = 5
-DEFAULT_CONTAINER_CFG_PATH=os.path.join(
-    os.path.dirname(os.path.abspath(__file__)),
-    'default.conf')
-TEMP_CONTAINER_CFG_FILE='tmp.conf'
 
 TESTS_RUN_ALL = -1
 TESTS_RUN_ALL_SUITES = "allsuites"

diff --git a/ftests/default.conf b/ftests/default.conf
deleted file mode 100644 (file)
index 12dd826..0000000
--- a/ftests/default.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template used to create this container: /usr/share/lxc/templates/lxc-download
-#
-# Default lxc configuration file for libcgroup functional tests
-#
-# Copyright (c) 2019 Oracle and/or its affiliates.  All rights reserved.
-# Author: Tom Hromatka <tom.hromatka@oracle.com>
-#
-
-#
-# This library is free software; you can redistribute it and/or modify it
-# under the terms of version 2.1 of the GNU Lesser General Public License as
-# published by the Free Software Foundation.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-# for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, see <http://www.gnu.org/licenses>.
-#
-
-# Distribution configuration
-lxc.include = /usr/share/lxc/config/common.conf
-lxc.include = /usr/share/lxc/config/userns.conf
-
-# Container specific configuration
-lxc.include = /etc/lxc/default.conf