openstack/zun
Code Issues Proposed changes

Merge "Use CRI driver for capsule by default"

Browse Source
This commit is contained in:
Zuul 2020-04-07 03:24:43 +00:00 committed by Gerrit Code Review
commit db45dc31a7
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/lib/zun
View File

@ -178,12 +178,8 @@ function create_zun_conf {
# (Re)create ``zun.conf`` # (Re)create ``zun.conf``
rm -f $ZUN_CONF rm -f $ZUN_CONF
if [[ ${ZUN_DRIVER} == "docker" ]]; then iniset $ZUN_CONF DEFAULT container_driver $ZUN_DRIVER
iniset $ZUN_CONF DEFAULT container_driver docker iniset $ZUN_CONF DEFAULT capsule_driver $ZUN_CAPSULE_DRIVER
fi
if [[ ${ZUN_CAPSULE_DRIVER} == "cri" ]]; then
iniset $ZUN_CONF DEFAULT capsule_driver cri
fi
iniset $ZUN_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL" iniset $ZUN_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL"
if [[ $SERVICE_IP_VERSION == 6 ]]; then if [[ $SERVICE_IP_VERSION == 6 ]]; then
iniset $ZUN_CONF DEFAULT my_ip "$HOST_IPV6" iniset $ZUN_CONF DEFAULT my_ip "$HOST_IPV6"

2
zun/conf/container_driver.py
View File

@ -30,7 +30,7 @@ Interdependencies to other options:
* None * None
"""), """),
cfg.StrOpt('capsule_driver', cfg.StrOpt('capsule_driver',
default='docker', default='cri',
help="""Defines which driver to use for controlling capsule. help="""Defines which driver to use for controlling capsule.
Possible values: Possible values: