From 1272081ddff6a826f32fa3ff8946f1aa44ae623b Mon Sep 17 00:00:00 2001 From: Ahmed Bilal Khalid Date: Fri, 13 Sep 2019 21:47:33 +0500 Subject: [PATCH] a --- app/api.py | 8 +++++++- app/file.py | 7 ++++++- app/host.py | 7 ++++++- app/image.py | 7 ++++++- app/scheduler.py | 7 ++++++- 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/app/api.py b/app/api.py index fa4cd87..c0ac6f1 100644 --- a/app/api.py +++ b/app/api.py @@ -3,7 +3,8 @@ import subprocess as sp import os import shutil -from app.helper import clone_common, clone_etcd_wrapper, install_available +from app.helper import install_available +from decouple import config @click.group() def api(): @@ -39,6 +40,11 @@ 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.writelines(content) diff --git a/app/file.py b/app/file.py index a99f485..b864bbb 100644 --- a/app/file.py +++ b/app/file.py @@ -28,7 +28,12 @@ def setup(path, base_dir, file_prefix, etcd_url): content = ( f"BASE_DIR={base_dir}\n" f"FILE_PREFIX={file_prefix}\n" - f"ETCD_URL={etcd_url}\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.writelines(content) diff --git a/app/host.py b/app/host.py index 1e64206..d886f90 100644 --- a/app/host.py +++ b/app/host.py @@ -34,7 +34,12 @@ def setup(path, ssh_username, ssh_key_path, ssh_key_pass, etcd_url, without_ceph f"ssh_pkey={ssh_key_path}\n" f"ssh_private_key_password={ssh_key_pass}\n" f"ETCD_URL={etcd_url}\n" - f"WITHOUT_CEPH={without_ceph}\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.writelines(content) diff --git a/app/image.py b/app/image.py index f68c81b..31ad421 100644 --- a/app/image.py +++ b/app/image.py @@ -28,7 +28,12 @@ def setup(path, base_dir, etcd_url, without_ceph): content = ( f"BASE_DIR={base_dir}\n" f"ETCD_URL={etcd_url}\n" - f"WITHOUT_CEPH={without_ceph}" + f"WITHOUT_CEPH={without_ceph}", + 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.writelines(content) diff --git a/app/scheduler.py b/app/scheduler.py index dc2ca0d..1fd40c6 100644 --- a/app/scheduler.py +++ b/app/scheduler.py @@ -32,7 +32,12 @@ def setup(path, vm_prefix, host_prefix, request_prefix, etcd_url): f"VM_PREFIX={vm_prefix}\n" f"HOST_PREFIX={host_prefix}\n" f"REQUEST_PREFIX={request_prefix}\n" - f"ETCD_URL={etcd_url}\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.writelines(content)