Skip to content
Snippets Groups Projects
Commit 14121d5f authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Add missing base os values to kolla-build.conf"

parents 11e5b7df 11c64571
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
kolla/common/config.py
+ 2
− 0
View file @ 14121d5f
...@@ -18,6 +18,7 @@ from oslo_config import types ...@@ -18,6 +18,7 @@ from oslo_config import types
from kolla.version import version_info as version from kolla.version import version_info as version
BASE_OS_DISTRO = ['centos', 'ubuntu', 'oraclelinux']
RDO_MIRROR = "http://trunk.rdoproject.org/centos7" RDO_MIRROR = "http://trunk.rdoproject.org/centos7"
DELOREAN = "{}/current-passed-ci/delorean.repo".format(RDO_MIRROR) DELOREAN = "{}/current-passed-ci/delorean.repo".format(RDO_MIRROR)
DELOREAN_DEPS = "{}/delorean-deps.repo".format(RDO_MIRROR) DELOREAN_DEPS = "{}/delorean-deps.repo".format(RDO_MIRROR)
...@@ -57,6 +58,7 @@ _PROFILE_OPTS = [ ...@@ -57,6 +58,7 @@ _PROFILE_OPTS = [
_CLI_OPTS = [ _CLI_OPTS = [
cfg.StrOpt('base', short='b', default='centos', cfg.StrOpt('base', short='b', default='centos',
choices=BASE_OS_DISTRO,
deprecated_group='kolla-build', deprecated_group='kolla-build',
help='The base distro to use when building'), help='The base distro to use when building'),
cfg.StrOpt('base-tag', default='latest', cfg.StrOpt('base-tag', default='latest',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment