diff options
| author | ChangBo Guo(gcb) <eric.guo@easystack.cn> | 2017-10-24 19:16:01 +0800 |
|---|---|---|
| committer | ChangBo Guo(gcb) <eric.guo@easystack.cn> | 2017-11-14 07:30:53 +0800 |
| commit | 9cfd8533830fb2ad5a545ce4836c0800604d17fa (patch) | |
| tree | 648ad40cb2164c1dc3ca4781c091664a096ee4c1 | |
| parent | 35fd42d9ce52f2b3adea1598a0b86ad3094e25d8 (diff) | |
| download | kolla-9cfd8533830fb2ad5a545ce4836c0800604d17fa.tar.gz kolla-9cfd8533830fb2ad5a545ce4836c0800604d17fa.zip | |
Remove duplicated statement of parameter choices of config options
cfg.StrOpt's parameter choices will include available values when
generating sample config files. So don't need add more information
about allowed values in help string of config option which has
parameter choices'. These config opitons are 'base' and 'type'.
Before this change, comments of config option 'base' is:
"# The distro type of the base image. Allowed values are centos, rhel,
# ubuntu, oraclelinux, debian (string value)
# Allowed values: centos, rhel, ubuntu, oraclelinux, debian
# base = centos"
After this chagnge, comments of config option 'base' is:
"# The distro type of the base image (string value)
# Allowed values: centos, rhel, ubuntu, oraclelinux, debian
#base = centos"
Change-Id: I5261472d29cbdb9ecb8c06f66d5bac060602dd11
| -rwxr-xr-x | kolla/common/config.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index d4595a08e..4789f34ac 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -180,8 +180,7 @@ hostarch = os.uname()[4] _CLI_OPTS = [ cfg.StrOpt('base', short='b', default='centos', choices=BASE_OS_DISTRO, - help='The distro type of the base image. Allowed values ' - 'are ' + ', '.join(BASE_OS_DISTRO)), + help='The distro type of the base image.'), cfg.StrOpt('base-tag', default='latest', help='The base distro image tag'), cfg.StrOpt('base-image', @@ -238,8 +237,7 @@ _CLI_OPTS = [ cfg.StrOpt('type', short='t', default='binary', choices=INSTALL_TYPE_CHOICES, dest='install_type', - help=('The method of the OpenStack install. Allowed values ' - 'are ' + ', '.join(INSTALL_TYPE_CHOICES))), + help=('The method of the OpenStack install.')), cfg.IntOpt('threads', short='T', default=8, min=1, help=('The number of threads to use while building.' ' (Note: setting to one will allow real time' |