diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 07:16:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 07:16:55 +0000 |
| commit | 14121d5f47923f82b8c5ca8ec9cb04f9a0301312 (patch) | |
| tree | 4db8231879d31a08460ba0887faccf0f539f3af7 | |
| parent | 11e5b7dfa92afb72758e562115e60ee2cd9fdca5 (diff) | |
| parent | 11c6457164f2c07ab01fddf1c493694301457e8f (diff) | |
| download | kolla-14121d5f47923f82b8c5ca8ec9cb04f9a0301312.tar.gz kolla-14121d5f47923f82b8c5ca8ec9cb04f9a0301312.zip | |
Merge "Add missing base os values to kolla-build.conf"
| -rw-r--r-- | kolla/common/config.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index b9ab56b3e..1d7fb88d4 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -18,6 +18,7 @@ from oslo_config import types from kolla.version import version_info as version +BASE_OS_DISTRO = ['centos', 'ubuntu', 'oraclelinux'] RDO_MIRROR = "http://trunk.rdoproject.org/centos7" DELOREAN = "{}/current-passed-ci/delorean.repo".format(RDO_MIRROR) DELOREAN_DEPS = "{}/delorean-deps.repo".format(RDO_MIRROR) @@ -57,6 +58,7 @@ _PROFILE_OPTS = [ _CLI_OPTS = [ cfg.StrOpt('base', short='b', default='centos', + choices=BASE_OS_DISTRO, deprecated_group='kolla-build', help='The base distro to use when building'), cfg.StrOpt('base-tag', default='latest', |