diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-07 21:05:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-07 21:05:18 +0000 |
| commit | 17d5c32f0b0b87dfacfa08879883ad6a22a866db (patch) | |
| tree | 0c54a6b05ad15843564a77365aa5795dee1ec3ce /kolla/image | |
| parent | 78b3446f4827a5f94ad094f59d4011829f097144 (diff) | |
| parent | aeb86de6fc644a514d060b4ac869cab364266f03 (diff) | |
| download | kolla-17d5c32f0b0b87dfacfa08879883ad6a22a866db.tar.gz kolla-17d5c32f0b0b87dfacfa08879883ad6a22a866db.zip | |
Merge "Move RDO to Newton branches"
Diffstat (limited to 'kolla/image')
| -rw-r--r-- | kolla/image/build.py | 5 |
1 files changed, 4 insertions, 1 deletions
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'] |