diff --git a/charts/vs-registrar/files/registrar-config.yaml b/charts/vs-registrar/files/registrar-config.yaml index 9581a915924300b08ca384b8a823baac87aa2a81..46f25db18fa239aa2ad45e18c3f248a841800304 100644 --- a/charts/vs-registrar/files/registrar-config.yaml +++ b/charts/vs-registrar/files/registrar-config.yaml @@ -14,6 +14,9 @@ sources: auth_url: {{ $val.auth_url }} auth_version: {{ $val.auth_version }} user_domain_name: {{ $val.user_domain_name }} + user_domain_id: {{ $val.user_domain_id }} + project_domain_name: {{ $val.project_domain_name }} + project_domain_id: {{ $val.project_domain_id }} container: {{ $val.container }} {{- else if eq $type "s3" }} bucket_name: {{ $val.bucket | default "null" }} diff --git a/registrar/source.py b/registrar/source.py index 2109a2a68e63785b1f6201d2815ddc0c284140b0..d1ca6893a86d292aa12d85ed7ecc3c9a84c0e0fa 100644 --- a/registrar/source.py +++ b/registrar/source.py @@ -72,6 +72,10 @@ class SwiftSource(Source): project_name (str, optional): name of swift tenant. Defaults to None. project_id (str, optional): id of swift tenant. Defaults to None. region_name (str, optional): name of region. Defaults to None. + project_domain_id (str, optional): project domain identifier. + Defaults to None. + project_domain_name (str, optional): name of project domain. + Defaults to None. user_domain_id (str, optional): user domain identifier. Defaults to None. user_domain_name (str, optional): name of user domain. @@ -90,6 +94,8 @@ class SwiftSource(Source): project_name: str = None, project_id: str = None, region_name: str = None, + project_domain_id: str=None, + project_domain_name: str=None, user_domain_id: str = None, user_domain_name: str = None, auth_url: str = None, @@ -104,6 +110,8 @@ class SwiftSource(Source): self.project_name = project_name self.project_id = project_id self.region_name = region_name + self.project_domain_id = project_domain_id + self.project_domain_name = project_domain_name self.user_domain_id = user_domain_id self.user_domain_name = user_domain_name self.auth_url = auth_url @@ -121,6 +129,8 @@ class SwiftSource(Source): "os_region_name": self.region_name, "os_auth_url": self.auth_url, "auth_version": self.auth_version, + "os_project_domain_id": self.project_domain_id, + "os_project_domain_name": self.project_domain_name, "os_user_domain_id": self.user_domain_id, "os_user_domain_name": self.user_domain_name, }