diff --git a/etc/scheduler.conf.sample b/etc/scheduler.conf.sample index d161cb4e..69101c0a 100644 --- a/etc/scheduler.conf.sample +++ b/etc/scheduler.conf.sample @@ -34,6 +34,10 @@ # Number of jobs that can be executed at the same time (integer value) #concurrent_jobs = 1 +# Use freezer-api v1 interface if enable_v1_api (boolean value). If +# enable_v1_api is set as True, otherwise use freezer-api v2 interface. +#enable_v1_api = False + # # From oslo.log # diff --git a/freezer/scheduler/arguments.py b/freezer/scheduler/arguments.py index c6f6ca49..d19c10cd 100644 --- a/freezer/scheduler/arguments.py +++ b/freezer/scheduler/arguments.py @@ -101,6 +101,12 @@ def get_common_opts(): dest='concurrent_jobs', help='Number of jobs that can be executed at the' ' same time'), + cfg.BoolOpt('enable-v1-api', + default=False, + dest='enable_v1_api', + help='Use freezer-api v1 interface if enable_v1_api' + ' is set as True, otherwise use freezer-api' + ' v2 interface'), ] return _COMMON diff --git a/freezer/scheduler/freezer_scheduler.py b/freezer/scheduler/freezer_scheduler.py index 9a1224a5..0d548f07 100644 --- a/freezer/scheduler/freezer_scheduler.py +++ b/freezer/scheduler/freezer_scheduler.py @@ -208,7 +208,13 @@ def main(): apiclient = None if CONF.no_api is False: try: - apiclient = client_utils.get_client_instance(opts=CONF) + if CONF.enable_v1_api: + apiclient = client_utils.get_client_instance(opts=CONF, + api_version='1') + else: + apiclient = client_utils.get_client_instance(opts=CONF, + api_version='2') + if CONF.client_id: apiclient.client_id = CONF.client_id except Exception as e: