Merge "Add CONF option to set default auto_update value"
This commit is contained in:
commit
6e54e4437d
|
@ -17,6 +17,7 @@ import tarfile
|
||||||
import tempfile
|
import tempfile
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from sysinv._i18n import _
|
from sysinv._i18n import _
|
||||||
from sysinv.common import constants
|
from sysinv.common import constants
|
||||||
|
@ -24,6 +25,8 @@ from sysinv.common import exception
|
||||||
from sysinv.common import kubernetes
|
from sysinv.common import kubernetes
|
||||||
from sysinv.common import utils
|
from sysinv.common import utils
|
||||||
|
|
||||||
|
CONF = cfg.CONF
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
@ -627,7 +630,7 @@ def extract_bundle_metadata(file_path):
|
||||||
'auto_update':
|
'auto_update':
|
||||||
metadata.get(constants.APP_METADATA_UPGRADES, {}).get(
|
metadata.get(constants.APP_METADATA_UPGRADES, {}).get(
|
||||||
constants.APP_METADATA_AUTO_UPDATE,
|
constants.APP_METADATA_AUTO_UPDATE,
|
||||||
constants.APP_METADATA_AUTO_UPDATE_DEFAULT_VALUE),
|
CONF.app_framework.missing_auto_update),
|
||||||
'k8s_auto_update': k8s_auto_update,
|
'k8s_auto_update': k8s_auto_update,
|
||||||
'k8s_timing': k8s_update_timing,
|
'k8s_timing': k8s_update_timing,
|
||||||
'k8s_minimum_version': minimum_supported_k8s_version,
|
'k8s_minimum_version': minimum_supported_k8s_version,
|
||||||
|
|
|
@ -192,6 +192,10 @@ app_framework_opts = [
|
||||||
cfg.IntOpt('fluxcd_hr_reconcile_check_delay',
|
cfg.IntOpt('fluxcd_hr_reconcile_check_delay',
|
||||||
default=60,
|
default=60,
|
||||||
help='Delay time to check progress of helmrelease'),
|
help='Delay time to check progress of helmrelease'),
|
||||||
|
cfg.BoolOpt('missing_auto_update',
|
||||||
|
default=False,
|
||||||
|
help='Auto update an application if not specified in the '
|
||||||
|
'application metadata'),
|
||||||
]
|
]
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|
Loading…
Reference in New Issue