diff options
| author | Steven Dake <stdake@cisco.com> | 2016-10-07 01:26:24 -0400 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-10-07 03:40:10 -0400 |
| commit | aeb86de6fc644a514d060b4ac869cab364266f03 (patch) | |
| tree | 0a4728ea2902530950f43509af88a8db0418f38f /kolla | |
| parent | b58147bcc0a98f694075b9593bffced1ab63bec0 (diff) | |
| download | kolla-aeb86de6fc644a514d060b4ac869cab364266f03.tar.gz kolla-aeb86de6fc644a514d060b4ac869cab364266f03.zip | |
Move RDO to Newton branches
RDO Newton is available. Lets use it and test with it this final week.
TrivialFix
Change-Id: I2a761366da7c2cf209adaceb73ac7fa9c9aa3cba
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 2 | ||||
| -rw-r--r-- | kolla/image/build.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 94b4cc1c8..d00d265e2 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -144,7 +144,7 @@ _BASE_OPTS = [ cfg.StrOpt('maintainer', default='Kolla Project (https://launchpad.net/kolla)', help='The MAINTAINER field'), - cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS], + cfg.ListOpt('rpm_setup_config', help=('Comma separated list of .rpm or .repo file(s) ' 'or URL(s) to install before building containers')), cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')), diff --git a/kolla/image/build.py b/kolla/image/build.py index d0d36a457..59f4f3ced 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -514,7 +514,10 @@ class KollaWorker(object): self.install_type = conf.install_type self.tag = conf.tag self.images = list() - rpm_setup_config = filter(None, conf.rpm_setup_config) + if conf.rpm_setup_config: + rpm_setup_config = filter(None, conf.rpm_setup_config) + else: + rpm_setup_config = list() self.rpm_setup = self.build_rpm_setup(rpm_setup_config) rh_base = ['fedora', 'centos', 'oraclelinux', 'rhel'] |