Update get_user_id func
diff --git a/staffeln/common/openstack.py b/staffeln/common/openstack.py
index c4a28c1..aa0bf16 100644
--- a/staffeln/common/openstack.py
+++ b/staffeln/common/openstack.py
@@ -6,12 +6,19 @@
# user
def get_user_id():
user_name = conn.config.auth["username"]
- domain_id = conn.config.auth["user_domain_id"]
- user = conn.get_user(name_or_id=user_name, domain_id=domain_id)
+ if "user_domain_id" in conn.config.auth:
+ domain_id = conn.config.auth["user_domain_id"]
+ user = conn.get_user(name_or_id=user_name, domain_id=domain_id)
+ elif "user_domain_name" in conn.config.auth:
+ domain_name = conn.config.auth["user_domain_name"]
+ user = conn.get_user(name_or_id=user_name, domain_id=domain_name)
+ else:
+ user = conn.get_user(name_or_id=user_name)
return user.id
############## project
def get_projects():
+ conn.block_storage
return conn.list_projects()