Merge "Collectd network configuration"
This commit is contained in:
commit
9642088282
|
@ -1174,6 +1174,10 @@ SERVICE_PARAM_HTTP_PORT_HTTPS_DEFAULT = 8443
|
||||||
SERVICE_PARAM_SECTION_OPENSTACK_HELM = 'helm'
|
SERVICE_PARAM_SECTION_OPENSTACK_HELM = 'helm'
|
||||||
SERVICE_PARAM_NAME_ENDPOINT_DOMAIN = "endpoint_domain"
|
SERVICE_PARAM_NAME_ENDPOINT_DOMAIN = "endpoint_domain"
|
||||||
|
|
||||||
|
# Collectd Service Parameters
|
||||||
|
SERVICE_PARAM_SECTION_COLLECTD = 'collectd'
|
||||||
|
SERVICE_PARAM_COLLECTD_NETWORK_SERVERS = 'network_servers'
|
||||||
|
|
||||||
# TIS part number, CPE = combined load, STD = standard load
|
# TIS part number, CPE = combined load, STD = standard load
|
||||||
TIS_STD_BUILD = 'Standard'
|
TIS_STD_BUILD = 'Standard'
|
||||||
TIS_AIO_BUILD = 'All-in-one'
|
TIS_AIO_BUILD = 'All-in-one'
|
||||||
|
|
|
@ -704,6 +704,26 @@ OPENSTACK_HELM_PARAMETER_RESOURCE = {
|
||||||
'openstack::helm::params::endpoint_domain',
|
'openstack::helm::params::endpoint_domain',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
COLLECTD_NETWORK_SERVERS_PARAMETER_DATA_FORMAT = {
|
||||||
|
constants.SERVICE_PARAM_COLLECTD_NETWORK_SERVERS:
|
||||||
|
SERVICE_PARAMETER_DATA_FORMAT_ARRAY,
|
||||||
|
}
|
||||||
|
|
||||||
|
COLLECTD_PARAMETER_OPTIONAL = [
|
||||||
|
constants.SERVICE_PARAM_COLLECTD_NETWORK_SERVERS,
|
||||||
|
]
|
||||||
|
|
||||||
|
COLLECTD_PARAMETER_VALIDATOR = {
|
||||||
|
constants.SERVICE_PARAM_COLLECTD_NETWORK_SERVERS:
|
||||||
|
_validate_SAN_list,
|
||||||
|
}
|
||||||
|
|
||||||
|
COLLECTD_PARAMETER_RESOURCE = {
|
||||||
|
constants.SERVICE_PARAM_COLLECTD_NETWORK_SERVERS:
|
||||||
|
'platform::collectd::params::network_servers',
|
||||||
|
}
|
||||||
|
|
||||||
PTP_GLOBAL_PARAMETER_OPTIONAL = [
|
PTP_GLOBAL_PARAMETER_OPTIONAL = [
|
||||||
constants.SERVICE_PARAM_NAME_WILDCARD
|
constants.SERVICE_PARAM_NAME_WILDCARD
|
||||||
]
|
]
|
||||||
|
@ -764,6 +784,12 @@ SERVICE_PARAMETER_SCHEMA = {
|
||||||
SERVICE_PARAM_DATA_FORMAT: PLATFORM_CRI_PARAMETER_DATA_FORMAT,
|
SERVICE_PARAM_DATA_FORMAT: PLATFORM_CRI_PARAMETER_DATA_FORMAT,
|
||||||
SERVICE_PARAM_RESOURCE: PLATFORM_CRI_PARAMETER_RESOURCE,
|
SERVICE_PARAM_RESOURCE: PLATFORM_CRI_PARAMETER_RESOURCE,
|
||||||
},
|
},
|
||||||
|
constants.SERVICE_PARAM_SECTION_COLLECTD: {
|
||||||
|
SERVICE_PARAM_OPTIONAL: COLLECTD_PARAMETER_OPTIONAL,
|
||||||
|
SERVICE_PARAM_VALIDATOR: COLLECTD_PARAMETER_VALIDATOR,
|
||||||
|
SERVICE_PARAM_RESOURCE: COLLECTD_PARAMETER_RESOURCE,
|
||||||
|
SERVICE_PARAM_DATA_FORMAT: COLLECTD_NETWORK_SERVERS_PARAMETER_DATA_FORMAT,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
constants.SERVICE_TYPE_HORIZON: {
|
constants.SERVICE_TYPE_HORIZON: {
|
||||||
constants.SERVICE_PARAM_SECTION_HORIZON_AUTH: {
|
constants.SERVICE_PARAM_SECTION_HORIZON_AUTH: {
|
||||||
|
|
|
@ -8900,6 +8900,12 @@ class ConductorManager(service.PeriodicService):
|
||||||
# diff list or dict, to only target required personalities.
|
# diff list or dict, to only target required personalities.
|
||||||
if section == constants.SERVICE_PARAM_SECTION_KUBERNETES_CONFIG:
|
if section == constants.SERVICE_PARAM_SECTION_KUBERNETES_CONFIG:
|
||||||
personalities = [constants.CONTROLLER, constants.WORKER]
|
personalities = [constants.CONTROLLER, constants.WORKER]
|
||||||
|
elif service == constants.SERVICE_TYPE_PLATFORM:
|
||||||
|
if section == constants.SERVICE_PARAM_SECTION_COLLECTD:
|
||||||
|
reboot = True
|
||||||
|
personalities = [constants.CONTROLLER,
|
||||||
|
constants.WORKER,
|
||||||
|
constants.STORAGE]
|
||||||
|
|
||||||
# we should not set the reboot flag on operations that are not
|
# we should not set the reboot flag on operations that are not
|
||||||
# reboot required. An apply of a service parameter is not reboot
|
# reboot required. An apply of a service parameter is not reboot
|
||||||
|
|
Loading…
Reference in New Issue