Use consistent URI for lock server

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/config.py b/teuthology/config.py
index 8f193a44cc926b7293ff393acfd577837763eb96..604d19711139397ea53a8a4222ee951b9a76e59d 100644 (file)
--- a/teuthology/config.py
+++ b/teuthology/config.py
@@ -109,7 +109,7 @@ class TeuthologyConfig(YamlConfig):
         'archive_base': '/var/lib/teuthworker/archive',
         'automated_scheduling': False,
         'ceph_git_base_url': 'https://github.com/ceph/',
-        'lock_server': 'http://paddles.front.sepia.ceph.com/nodes/',
+        'lock_server': 'http://paddles.front.sepia.ceph.com/',
         'max_job_time': 259200,  # 3 days
         'results_server': 'http://paddles.front.sepia.ceph.com/',
         'src_base_path': os.path.expanduser('~/src'),

diff --git a/teuthology/lock.py b/teuthology/lock.py
index b976e1d81608ccc5f870e1b510fe0c43e22e7ad7..b920f6a6cf85729c02faf23cac684d5a8eb65538 100644 (file)
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -207,7 +207,7 @@ def lock_many(ctx, num, machinetype, user=None, description=None):
     if user is None:
         user = misc.get_user()
     for machinetype in machinetypes:
-        uri = os.path.join(config.lock_server, 'lock_many', '')
+        uri = os.path.join(config.lock_server, 'nodes', 'lock_many', '')
         response = requests.post(
             uri,
             json.dumps(
@@ -249,7 +249,7 @@ def lock_one(name, user=None, description=None):
         user = misc.get_user()
     request = dict(name=name, locked=True, locked_by=user,
                    description=description)
-    uri = os.path.join(config.lock_server, name, 'lock', '')
+    uri = os.path.join(config.lock_server, 'nodes', name, 'lock', '')
     response = requests.put(uri, json.dumps(request))
     success = response.ok
     if success:
@@ -268,7 +268,7 @@ def unlock_one(ctx, name, user=None):
     if user is None:
         user = misc.get_user()
     request = dict(name=name, locked=False, locked_by=user, description=None)
-    uri = os.path.join(config.lock_server, name, 'lock', '')
+    uri = os.path.join(config.lock_server, 'nodes', name, 'lock', '')
     response = requests.put(uri, json.dumps(request))
     success = response.ok
     if success:
@@ -287,7 +287,7 @@ def unlock_one(ctx, name, user=None):
 
 
 def list_locks(keyed_by_name=False, **kwargs):
-    uri = os.path.join(config.lock_server, '')
+    uri = os.path.join(config.lock_server, 'nodes', '')
     if kwargs:
         uri += '?' + urllib.urlencode(kwargs)
     response = requests.get(uri)
@@ -317,7 +317,7 @@ def update_lock(name, description=None, status=None, ssh_pub_key=None):
         updated['ssh_pub_key'] = ssh_pub_key
 
     if updated:
-        uri = os.path.join(config.lock_server, name, '')
+        uri = os.path.join(config.lock_server, 'nodes', name, '')
         response = requests.put(
             uri,
             json.dumps(updated))