diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-17 09:34:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-17 09:34:47 +0000 |
| commit | 05c32b4415302e4d2c3528b0273a458b4a64813d (patch) | |
| tree | 7016581845f1faea580232cfd6075670fa597131 | |
| parent | a4b23803ff34e957513749e2ddd3a29a85b4e240 (diff) | |
| parent | c5b3ca719cc28fb14ec2b13542ec3cad811a3229 (diff) | |
| download | kolla-05c32b4415302e4d2c3528b0273a458b4a64813d.tar.gz kolla-05c32b4415302e4d2c3528b0273a458b4a64813d.zip | |
Merge "fix handling of delorean on non-x86"
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index fefe48386..3d6bf0ea6 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -45,8 +45,8 @@ DELOREAN = \ # there is ongoing work to sort that out DELOREAN_DEPS = { 'x86_64': "https://trunk.rdoproject.org/centos7/delorean-deps.repo", - 'aarch64': None, - 'ppc64le': None + 'aarch64': "", + 'ppc64le': "" } INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos'] diff --git a/kolla/image/build.py b/kolla/image/build.py index 85b96e294..0d7e7ef82 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -622,7 +622,7 @@ class KollaWorker(object): else: # Copy .repo file from filesystem cmd = "COPY {} /etc/yum.repos.d/".format(config) - elif config is None: + elif not config: cmd = '' else: raise exception.KollaRpmSetupUnknownConfig( |