diff options
| author | Steven Dake <stdake@cisco.com> | 2016-10-14 13:23:39 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-11-02 03:28:15 -0700 |
| commit | e714a745c65d5729705c71b808e29a2b32c09ae5 (patch) | |
| tree | d397e02a8307e96de9f5d0a7145cea4fdff62154 /kolla | |
| parent | 0d5407d55ee2aa96a4cbeea25ae252e11c660371 (diff) | |
| download | kolla-e714a745c65d5729705c71b808e29a2b32c09ae5.tar.gz kolla-e714a745c65d5729705c71b808e29a2b32c09ae5.zip | |
Revert "Move RDO to Newton branches"
Revert note: Get RDO back on master instead of the newton branch
This reverts commit aeb86de6fc644a514d060b4ac869cab364266f03.
Change-Id: I765ba60c3bd09fe3978570b7921a084c9b90c7d0
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 2 | ||||
| -rw-r--r-- | kolla/image/build.py | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 0eac28704..92fc1254a 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -145,7 +145,7 @@ _BASE_OPTS = [ cfg.StrOpt('maintainer', default='Kolla Project (https://launchpad.net/kolla)', help='The MAINTAINER field'), - cfg.ListOpt('rpm_setup_config', + cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS], 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 916272c0c..231824e85 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -511,10 +511,7 @@ class KollaWorker(object): self.install_type = conf.install_type self.tag = conf.tag self.images = list() - if conf.rpm_setup_config: - rpm_setup_config = filter(None, conf.rpm_setup_config) - else: - rpm_setup_config = list() + rpm_setup_config = filter(None, conf.rpm_setup_config) self.rpm_setup = self.build_rpm_setup(rpm_setup_config) rh_base = ['fedora', 'centos', 'oraclelinux', 'rhel'] |