From 5d8c4d7bf72027a814a5189eaca80866f4de0c17 Mon Sep 17 00:00:00 2001 From: Radoslaw Smigielski Date: Tue, 30 Apr 2019 16:40:13 -0600 Subject: Fix incorrect type conversion for cmd option '--docker-dir' kolla-build cmd '--docker-dir' option specified a default value of an empty list, this was causing a warning on tox genconfig. Change-Id: I204a067d76395ef5ad4d3ce23243f196eab3bdd5 Closes-Bug: #1827146 --- kolla/common/config.py | 2 +- kolla/image/kolla_worker.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index 06aa7a731..7e06fd7f8 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -224,7 +224,7 @@ _CLI_OPTS = [ cfg.MultiOpt('docker-dir', types.String(), help=('Path to additional docker file template directory,' ' can be specified multiple times'), - short='D', default=[]), + short='D'), cfg.StrOpt('logs-dir', help='Path to logs directory'), cfg.BoolOpt('pull', default=True, help='Attempt to pull a newer version of the base image'), diff --git a/kolla/image/kolla_worker.py b/kolla/image/kolla_worker.py index f8c4bd044..b1e7ac943 100644 --- a/kolla/image/kolla_worker.py +++ b/kolla/image/kolla_worker.py @@ -246,8 +246,9 @@ class KollaWorker(object): self.temp_dir = tempfile.mkdtemp(prefix='kolla-' + ts) self.working_dir = os.path.join(self.temp_dir, 'docker') self.copy_dir(self.images_dir, self.working_dir) - for dir in self.conf.docker_dir: - self.copy_dir(dir, self.working_dir) + if self.conf.docker_dir: + for dir in self.conf.docker_dir: + self.copy_dir(dir, self.working_dir) self.copy_apt_files() LOG.debug('Created working dir: %s', self.working_dir) -- cgit v1.2.3