diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-01 21:14:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-01 21:14:18 +0000 |
| commit | a728239f41a2f1bd9b42d635c596835c934a2698 (patch) | |
| tree | 048ec347439bfafcd00f8dbfbd7c6ffae5c4fba1 | |
| parent | f5be229ae65beb9887ea68782bec07d73ff01d42 (diff) | |
| parent | 658bd38ca58d96af36864052ae123f049cf5c039 (diff) | |
| download | kolla-a728239f41a2f1bd9b42d635c596835c934a2698.tar.gz kolla-a728239f41a2f1bd9b42d635c596835c934a2698.zip | |
Merge "add base_arch variable for future non-x86 work"
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/non-x86-support-bce168d78db50202.yaml | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index db4668246..e5a3cedfa 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.BoolOpt('skip-parents', default=False, diff --git a/kolla/image/build.py b/kolla/image/build.py index 125a3bdcb..5c171d94c 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -536,6 +536,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]) @@ -706,6 +707,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, diff --git a/releasenotes/notes/non-x86-support-bce168d78db50202.yaml b/releasenotes/notes/non-x86-support-bce168d78db50202.yaml new file mode 100644 index 000000000..ad32ec2a3 --- /dev/null +++ b/releasenotes/notes/non-x86-support-bce168d78db50202.yaml @@ -0,0 +1,4 @@ +--- +features: + - New CLI argument "--base-arch" allows to select which architecture is + targetted by build. |