diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-05-16 17:32:39 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-05-16 17:36:11 +0200 |
| commit | c5b3ca719cc28fb14ec2b13542ec3cad811a3229 (patch) | |
| tree | 7668bc4568d76a4f2100af90d03ba530d575eff1 | |
| parent | 576743b0b72e8df68bbfc0f2fd7ecedde5fae31e (diff) | |
| download | kolla-c5b3ca719cc28fb14ec2b13542ec3cad811a3229.tar.gz kolla-c5b3ca719cc28fb14ec2b13542ec3cad811a3229.zip | |
fix handling of delorean on non-x86
Python 2.7.5 != 2.7.9 when it comes to handling None. So sort disabling
delorean-deps.repo on non-x86 in other way.
Change-Id: Iae86c391c7dcf006538d39d9b447f47171b8b541
Partially-Implements: blueprint multiarch-and-arm64-containers
| -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( |