diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-03-29 11:16:42 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-03-30 13:11:24 +0200 |
| commit | 658bd38ca58d96af36864052ae123f049cf5c039 (patch) | |
| tree | 2da8b9c035ea347c88b372aecd47cbb85255835a /kolla | |
| parent | ce716ebe228a29f37fbdfc69aaa34413e6f409a5 (diff) | |
| download | kolla-658bd38ca58d96af36864052ae123f049cf5c039.tar.gz kolla-658bd38ca58d96af36864052ae123f049cf5c039.zip | |
add base_arch variable for future non-x86 work
This variable will allow to select which target architecture has to be
used.
Partially-Implements: blueprint multiarch-and-arm64-containers
Change-Id: I71ddb7ef57c64d2505cac96724b1ab6772a57d6a
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 047963498..d9f7fb91b 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -19,6 +19,7 @@ from kolla.version import version_info as version BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'oraclelinux', 'debian'] +BASE_ARCH = ['x86_64'] DISTRO_RELEASE = { 'centos': '7', 'rhel': '7', @@ -154,6 +155,9 @@ _CLI_OPTS = [ help='The base distro image tag'), cfg.StrOpt('base-image', help='The base image name. Default is the same with base'), + cfg.StrOpt('base-arch', default='x86_64', + choices=BASE_ARCH, + help='The base architecture.'), cfg.BoolOpt('debug', short='d', default=False, help='Turn on debugging log level'), cfg.DictOpt('build-args', diff --git a/kolla/image/build.py b/kolla/image/build.py index 7db9a24a0..fa0843f1d 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -530,6 +530,7 @@ class KollaWorker(object): self.base_tag = conf.base_tag self.install_type = conf.install_type self.tag = conf.tag + self.base_arch = conf.base_arch self.images = list() rpm_setup_config = ([repo_file for repo_file in conf.rpm_setup_config if repo_file is not None]) @@ -699,6 +700,7 @@ class KollaWorker(object): values = {'base_distro': self.base, 'base_image': self.conf.base_image, 'base_distro_tag': self.base_tag, + 'base_arch': self.base_arch, 'supported_distro_release': supported_distro_release, 'install_metatype': self.install_metatype, 'image_prefix': self.image_prefix, |