From 742a1237a5511930ff2726819e6fd2a320e7fd06 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Tue, 12 Jun 2018 10:27:12 +0200 Subject: Remove the pike specific files We are already preparing for Gambia release and that means Openstack Queens for the traditional release track. Therefore, we can remove the specific configs for Openstack Pike Change-Id: Ib49a53e73ae1020aaead8a897dff8733147d87ac Signed-off-by: Manuel Buil --- sfc/lib/config.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'sfc/lib') diff --git a/sfc/lib/config.py b/sfc/lib/config.py index e6149081..541f6847 100644 --- a/sfc/lib/config.py +++ b/sfc/lib/config.py @@ -43,22 +43,7 @@ class CommonConfig(object): self.vnffgd_dir = os.path.join(self.sfc_test_dir, "vnffgd-templates") self.functest_results_dir = os.path.join( getattr(config.CONF, 'dir_results'), "odl-sfc") - - # We need to know the openstack version in order to use one config or - # another. For Pike we will use config-pike.yaml. Queens and Rocky - # will use config.yaml - if 'OPENSTACK_OSA_VERSION' in os.environ: - if os.environ['OPENSTACK_OSA_VERSION'] == 'stable/pike': - self.config_file = os.path.join(self.sfc_test_dir, - "config-pike.yaml") - else: - self.config_file = os.path.join(self.sfc_test_dir, - "config.yaml") - else: - self.config_file = os.path.join(self.sfc_test_dir, - "config-pike.yaml") - - logger.info("The config file used is {}".format(self.config_file)) + self.config_file = os.path.join(self.sfc_test_dir, "config.yaml") self.vim_file = os.path.join(self.sfc_test_dir, "register-vim.json") self.installer_type = env.get('INSTALLER_TYPE') -- cgit 1.2.3-korg