fix(Project):added project domain id

deNBI · May 23, 2019 · 9e8bd56 · 9e8bd56
1 parent 282b2e9
commit 9e8bd56
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/VirtualMachineService/VirtualMachineHandler.py b/VirtualMachineService/VirtualMachineHandler.py
@@ -60,7 +60,7 @@ def create_connection(self):
                 auth_url=self.AUTH_URL,
                 project_name=self.PROJECT_NAME,
                 user_domain_name=self.USER_DOMAIN_NAME,
-                project_domain_name="default",
+                project_domain_id=self.PROJECT_DOMAIN_ID
             )
             conn.authorize()
         except Exception as e:
@@ -102,6 +102,7 @@ def __init__(self, config):
         self.PROJECT_ID = os.environ["OS_PROJECT_ID"]
         self.USER_DOMAIN_NAME = os.environ["OS_USER_DOMAIN_NAME"]
         self.AUTH_URL = os.environ["OS_AUTH_URL"]
+        self.PROJECT_DOMAIN_ID=os.environ["OS_PROJECT_DOMAIN_ID"]
         self.SSH_PORT = 22
 
         with open(config, "r") as ymlfile:

diff --git a/VirtualMachineService/VirtualMachineServer.py b/VirtualMachineService/VirtualMachineServer.py
@@ -24,6 +24,7 @@
 PROJECT_ID = 'OS_PROJECT_ID'
 USER_DOMAIN_ID = 'OS_USER_DOMAIN_NAME'
 AUTH_URL = 'OS_AUTH_URL'
+PROJECT_DOMAIN_ID="OS_PROJECT_DOMAIN_ID"
 
 environment_variables = [
     USERNAME,
@@ -32,6 +33,7 @@
     PROJECT_ID,
     USER_DOMAIN_ID,
     AUTH_URL,
+    PROJECT_DOMAIN_ID
 ]
 
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,6 +14,7 @@ services:
       - OS_USERNAME
       - OS_PASSWORD
       - OS_USER_DOMAIN_NAME
+      - OS_PROJECT_DOMAIN_ID
 
     volumes:
       - ./VirtualMachineService/config/config.yml:/code/VirtualMachineService/config.yml