diff --git a/app/api.py b/app/api.py index d905f6f..dd08528 100644 --- a/app/api.py +++ b/app/api.py @@ -40,12 +40,12 @@ def setup(path, auth_name, auth_seed, auth_realm, f"REALM_ALLOWED={list(realm_allowed)}\n" f"OTP_SERVER={otp_server}\n" f"ETCD_URL={etcd_url}\n" - f"VM_PREFIX=/v1/vm\n", - f"HOST_PREFIX=/v1/host\n", - f"IMAGE_PREFIX=/v1/image\n", - f"IMAGE_STORE_PREFIX=/v1/image_store\n", - f"REQUEST_PREFIX=/v1/request\n", - f"FILE_PREFIX=/v1/file\n" + f"VM_PREFIX=/v1/vm/\n", + f"HOST_PREFIX=/v1/host/\n", + f"IMAGE_PREFIX=/v1/image/\n", + f"IMAGE_STORE_PREFIX=/v1/image_store/\n", + f"REQUEST_PREFIX=/v1/request/\n", + f"FILE_PREFIX=/v1/file/\n" ) f.writelines(content) diff --git a/app/file.py b/app/file.py index a495ced..c2c2950 100644 --- a/app/file.py +++ b/app/file.py @@ -29,12 +29,12 @@ def setup(path, base_dir, file_prefix, etcd_url): f"BASE_DIR={base_dir}\n" f"FILE_PREFIX={file_prefix}\n" f"ETCD_URL={etcd_url}\n", - f"VM_PREFIX=/v1/vm\n", - f"HOST_PREFIX=/v1/host\n", - f"IMAGE_PREFIX=/v1/image\n", - f"IMAGE_STORE_PREFIX=/v1/image_store\n", - f"REQUEST_PREFIX=/v1/request\n", - f"FILE_PREFIX=/v1/file\n" + f"VM_PREFIX=/v1/vm/\n", + f"HOST_PREFIX=/v1/host/\n", + f"IMAGE_PREFIX=/v1/image/\n", + f"IMAGE_STORE_PREFIX=/v1/image_store/\n", + f"REQUEST_PREFIX=/v1/request/\n", + f"FILE_PREFIX=/v1/file/\n" ) f.writelines(content) diff --git a/app/host.py b/app/host.py index ce85f23..5c35a6c 100644 --- a/app/host.py +++ b/app/host.py @@ -35,12 +35,12 @@ def setup(path, ssh_username, ssh_key_path, ssh_key_pass, etcd_url, without_ceph f"ssh_private_key_password={ssh_key_pass}\n" f"ETCD_URL={etcd_url}\n" f"WITHOUT_CEPH={without_ceph}\n", - f"VM_PREFIX=/v1/vm\n", - f"HOST_PREFIX=/v1/host\n", - f"IMAGE_PREFIX=/v1/image\n", - f"IMAGE_STORE_PREFIX=/v1/image_store\n", - f"REQUEST_PREFIX=/v1/request\n", - f"FILE_PREFIX=/v1/file\n" + f"VM_PREFIX=/v1/vm/\n", + f"HOST_PREFIX=/v1/host/\n", + f"IMAGE_PREFIX=/v1/image/\n", + f"IMAGE_STORE_PREFIX=/v1/image_store/\n", + f"REQUEST_PREFIX=/v1/request/\n", + f"FILE_PREFIX=/v1/file/\n" ) f.writelines(content) diff --git a/app/image.py b/app/image.py index 32f268a..1263927 100644 --- a/app/image.py +++ b/app/image.py @@ -29,12 +29,12 @@ def setup(path, base_dir, etcd_url, without_ceph): f"BASE_DIR={base_dir}\n" f"ETCD_URL={etcd_url}\n" f"WITHOUT_CEPH={without_ceph}\n", - f"VM_PREFIX=/v1/vm\n", - f"HOST_PREFIX=/v1/host\n", - f"IMAGE_PREFIX=/v1/image\n", - f"IMAGE_STORE_PREFIX=/v1/image_store\n", - f"REQUEST_PREFIX=/v1/request\n", - f"FILE_PREFIX=/v1/file\n" + f"VM_PREFIX=/v1/vm/\n", + f"HOST_PREFIX=/v1/host/\n", + f"IMAGE_PREFIX=/v1/image/\n", + f"IMAGE_STORE_PREFIX=/v1/image_store/\n", + f"REQUEST_PREFIX=/v1/request/\n", + f"FILE_PREFIX=/v1/file/\n" ) f.writelines(content) diff --git a/app/scheduler.py b/app/scheduler.py index 47f2985..f81ccb1 100644 --- a/app/scheduler.py +++ b/app/scheduler.py @@ -33,12 +33,12 @@ def setup(path, vm_prefix, host_prefix, request_prefix, etcd_url): f"HOST_PREFIX={host_prefix}\n" f"REQUEST_PREFIX={request_prefix}\n" f"ETCD_URL={etcd_url}\n", - f"VM_PREFIX=/v1/vm\n", - f"HOST_PREFIX=/v1/host\n", - f"IMAGE_PREFIX=/v1/image\n", - f"IMAGE_STORE_PREFIX=/v1/image_store\n", - f"REQUEST_PREFIX=/v1/request\n", - f"FILE_PREFIX=/v1/file\n" + f"VM_PREFIX=/v1/vm/\n", + f"HOST_PREFIX=/v1/host/\n", + f"IMAGE_PREFIX=/v1/image/\n", + f"IMAGE_STORE_PREFIX=/v1/image_store/\n", + f"REQUEST_PREFIX=/v1/request/\n", + f"FILE_PREFIX=/v1/file/\n" ) f.writelines(content)