From 075362ed70542456741c2fb6b098c259f4c3ae6f Mon Sep 17 00:00:00 2001
From: Saad Zaher <eng.szaher@gmail.com>
Date: Fri, 16 Feb 2018 12:31:52 +0000
Subject: [PATCH] Freezer-scheduler support both APIs

This patch allows freezer-scheduler to use either API v1 or v2
You can alter it using OS_BACKUP_API_VERSION env variable

Depends-On: I83000f8bf39eed41d067ed663de9f459439eca9a
Change-Id: I2e5724b1f1a75121952e2beb3844d2c489e4df68
---
 devstack/lib/freezer                   | 2 ++
 freezer/scheduler/freezer_scheduler.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/devstack/lib/freezer b/devstack/lib/freezer
index c3d15aed..d525558b 100644
--- a/devstack/lib/freezer
+++ b/devstack/lib/freezer
@@ -75,6 +75,8 @@ function configure_freezer_scheduler {
     sudo chown $STACK_USER $FREEZER_JOBS_DIR
     [ ! -d $FREEZER_LOG_DIR ] &&  sudo mkdir -m 755 -p $FREEZER_LOG_DIR
     sudo chown $STACK_USER $FREEZER_LOG_DIR
+    sudo ls -lh $DEST
+    sudo ls -lh $DEST/logs
 
 
 }
diff --git a/freezer/scheduler/freezer_scheduler.py b/freezer/scheduler/freezer_scheduler.py
index b65a6b01..a178b436 100644
--- a/freezer/scheduler/freezer_scheduler.py
+++ b/freezer/scheduler/freezer_scheduler.py
@@ -22,7 +22,7 @@ import threading
 import time
 
 from apscheduler.schedulers import background
-from freezerclient.v1 import client
+from freezerclient import utils as client_utils
 from oslo_config import cfg
 from oslo_log import log
 
@@ -210,7 +210,7 @@ def main():
     apiclient = None
     if CONF.no_api is False:
         try:
-            apiclient = client.Client(opts=CONF)
+            apiclient = client_utils.get_client_instance(opts=CONF)
             if CONF.client_id:
                 apiclient.client_id = CONF.client_id
         except Exception as e: