From c5b3ca719cc28fb14ec2b13542ec3cad811a3229 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 16 May 2017 17:32:39 +0200 Subject: 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 --- kolla/common/config.py | 4 ++-- 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( -- cgit v1.2.3