Add user and project login domains to keystone
Added login_user_domain_name and login_project_domain_name parameters to keystone module. Closes-Bug: #1574000 Change-Id: I29524ac9dad063c266122ecee09563531217974c Signed-off-by: Gabor Lekeny <gabor.lekeny@ericsson.com>
This commit is contained in:
parent
4a70773429
commit
dce1b35de9
|
@ -38,6 +38,11 @@ options:
|
||||||
- login username to authenticate to keystone
|
- login username to authenticate to keystone
|
||||||
required: false
|
required: false
|
||||||
default: admin
|
default: admin
|
||||||
|
login_user_domain_name:
|
||||||
|
description:
|
||||||
|
- The domain login_user belongs to
|
||||||
|
required: false
|
||||||
|
default: None
|
||||||
login_password:
|
login_password:
|
||||||
description:
|
description:
|
||||||
- Password of login user
|
- Password of login user
|
||||||
|
@ -48,6 +53,11 @@ options:
|
||||||
- The project login_user belongs to
|
- The project login_user belongs to
|
||||||
required: false
|
required: false
|
||||||
default: None
|
default: None
|
||||||
|
login_project_domain_name:
|
||||||
|
description:
|
||||||
|
- The domain login_project belongs to
|
||||||
|
required: false
|
||||||
|
default: None
|
||||||
login_tenant_name:
|
login_tenant_name:
|
||||||
description:
|
description:
|
||||||
- The tenant login_user belongs to
|
- The tenant login_user belongs to
|
||||||
|
@ -522,6 +532,8 @@ class ManageKeystone(object):
|
||||||
'login_password',
|
'login_password',
|
||||||
'login_project_name',
|
'login_project_name',
|
||||||
'login_tenant_name',
|
'login_tenant_name',
|
||||||
|
'login_user_domain_name',
|
||||||
|
'login_project_domain_name',
|
||||||
'token',
|
'token',
|
||||||
'insecure'
|
'insecure'
|
||||||
]
|
]
|
||||||
|
@ -532,6 +544,10 @@ class ManageKeystone(object):
|
||||||
login_password = variables_dict.pop('login_password')
|
login_password = variables_dict.pop('login_password')
|
||||||
login_project_name = (variables_dict.pop('login_project_name', None) or
|
login_project_name = (variables_dict.pop('login_project_name', None) or
|
||||||
variables_dict.pop('login_tenant_name'))
|
variables_dict.pop('login_tenant_name'))
|
||||||
|
user_domain_name = variables_dict.pop('login_user_domain_name',
|
||||||
|
'Default')
|
||||||
|
project_domain_name = variables_dict.pop('login_project_domain_name',
|
||||||
|
'Default')
|
||||||
token = variables_dict.pop('token')
|
token = variables_dict.pop('token')
|
||||||
insecure = variables_dict.pop('insecure')
|
insecure = variables_dict.pop('insecure')
|
||||||
|
|
||||||
|
@ -564,8 +580,10 @@ class ManageKeystone(object):
|
||||||
insecure=insecure,
|
insecure=insecure,
|
||||||
auth_url=endpoint,
|
auth_url=endpoint,
|
||||||
username=login_user,
|
username=login_user,
|
||||||
|
user_domain_name=user_domain_name,
|
||||||
password=login_password,
|
password=login_password,
|
||||||
project_name=login_project_name
|
project_name=login_project_name,
|
||||||
|
project_domain_name=project_domain_name,
|
||||||
)
|
)
|
||||||
|
|
||||||
def _get_domain_from_vars(self, variables):
|
def _get_domain_from_vars(self, variables):
|
||||||
|
@ -1166,6 +1184,9 @@ def main():
|
||||||
login_user=dict(
|
login_user=dict(
|
||||||
required=False
|
required=False
|
||||||
),
|
),
|
||||||
|
login_user_domain_name=dict(
|
||||||
|
required=False
|
||||||
|
),
|
||||||
login_password=dict(
|
login_password=dict(
|
||||||
required=False
|
required=False
|
||||||
),
|
),
|
||||||
|
@ -1175,6 +1196,9 @@ def main():
|
||||||
login_project_name=dict(
|
login_project_name=dict(
|
||||||
required=False
|
required=False
|
||||||
),
|
),
|
||||||
|
login_project_domain_name=dict(
|
||||||
|
required=False
|
||||||
|
),
|
||||||
token=dict(
|
token=dict(
|
||||||
required=False
|
required=False
|
||||||
),
|
),
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The ability to support login user domain and login project domain has been added to the
|
||||||
|
keystone module.
|
||||||
|
|
||||||
|
::
|
||||||
|
|
||||||
|
# Example usage
|
||||||
|
- keystone:
|
||||||
|
command: ensure_user
|
||||||
|
endpoint: "{{ keystone_admin_endpoint }}"
|
||||||
|
login_user: admin
|
||||||
|
login_password: admin
|
||||||
|
login_project_name: admin
|
||||||
|
login_user_domain_name: custom
|
||||||
|
login_project_domain_name: custom
|
||||||
|
user_name: demo
|
||||||
|
password: demo
|
||||||
|
project_name: demo
|
||||||
|
domain_name: custom
|
||||||
|
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
The ability to support login user domain and login project domain has been added to the
|
||||||
|
keystone module. This resolves https://bugs.launchpad.net/openstack-ansible/+bug/1574000
|
||||||
|
|
||||||
|
::
|
||||||
|
|
||||||
|
# Example usage
|
||||||
|
- keystone:
|
||||||
|
command: ensure_user
|
||||||
|
endpoint: "{{ keystone_admin_endpoint }}"
|
||||||
|
login_user: admin
|
||||||
|
login_password: admin
|
||||||
|
login_project_name: admin
|
||||||
|
login_user_domain_name: custom
|
||||||
|
login_project_domain_name: custom
|
||||||
|
user_name: demo
|
||||||
|
password: demo
|
||||||
|
project_name: demo
|
||||||
|
domain_name: custom
|
Loading…
Reference in New Issue