Merge "Drop deprecation warning for OpenDaylight support"

This commit is contained in:
Zuul 2021-03-27 01:54:41 +00:00 committed by Gerrit Code Review
commit 53fd52ac4c
2 changed files with 1 additions and 12 deletions

View File

@ -187,14 +187,7 @@ DEPLOY_ANSIBLE_ACTIONS = {
}
# Key-value pair of deprecated service and its warning message
DEPRECATED_SERVICES = {"OS::TripleO::Services::OpenDaylightApi":
"You are using OpenDaylight as your networking"
" driver for OpenStack. OpenDaylight is deprecated"
" starting from Rocky and removed since Stein and "
"there is no upgrade or migration path from "
"OpenDaylight to another networking backend. We "
"recommend you understand other networking "
"alternatives such as OVS or OVN. "}
DEPRECATED_SERVICES = {}
# clouds_yaml related constants
CLOUD_HOME_DIR = os.path.expanduser('~' + os.environ.get('SUDO_USER', ''))

View File

@ -2355,10 +2355,6 @@ def check_file_for_enabled_service(env_file):
enabled, throw a warning about its deprecation and ask the user
whether to proceed with deployment despite deprecation.
For ODL as an example:
If "OS::TripleO::Services::OpenDaylightApi" service is included
in any of the parsed env_files, then check its value.
OS::TripleO::Services::OpenDaylightApi NOT OS::Heat::None
ODL is enabled.
:param env_file: The path of the environment file
:type env_file: String