diff options
| author | Zuul <zuul@review.opendev.org> | 2022-10-27 17:23:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-10-27 17:23:48 +0000 |
| commit | 0f67e99ee1b9e5a4ccad3c5b40c3bcaec80de34a (patch) | |
| tree | ef25768b676ca6c758e5a6ba1aa1d6d1e9cc223b | |
| parent | 8fe9440f9511413c5aa7fa0be0a746dfc119dda0 (diff) | |
| parent | 5d8c4d7bf72027a814a5189eaca80866f4de0c17 (diff) | |
| download | kolla-0f67e99ee1b9e5a4ccad3c5b40c3bcaec80de34a.tar.gz kolla-0f67e99ee1b9e5a4ccad3c5b40c3bcaec80de34a.zip | |
Merge "Fix incorrect type conversion for cmd option '--docker-dir'"
| -rw-r--r-- | kolla/common/config.py | 2 | ||||
| -rw-r--r-- | 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) |