openstack/openstack-ansible-os_cloudkitty
Code Issues Proposed changes

Use keystone library to create cloudkitty user

Browse Source 
The keystone library has been updated to support adding a user to a
domain without specifying a project.  Use it instead of shelling out
to the openstackclient.

Change-Id: I8e6e68957af02626e3c3e8c68189f04ea3dd0816
This commit is contained in:
Jimmy McCrory
2016-07-19 07:33:35 -07:00
parent f551d2baa8
commit 38aa63fafe
1 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tasks/cloudkitty_domain_setup.yml
View File

@@ -30,38 +30,17 @@
- cloudkitty-domain-setup - cloudkitty-domain-setup
- cloudkitty-config - cloudkitty-config
#- name: Ensure cloudkitty user
# keystone:
# command: "ensure_user"
# user_name: "{{ cloudkitty_username }}"
# password: "{{ cloudkitty_user_password }}"
# login_user: "{{ keystone_admin_user_name }}"
# login_password: "{{ keystone_auth_admin_password }}"
# login_project_name: "{{ keystone_admin_tenant_name }}"
# endpoint: "{{ keystone_service_adminurl }}"
# insecure: "{{ keystone_service_adminuri_insecure }}"
# tags:
# - cloudkitty-domain
# - cloudkitty-domain-setup
# - cloudkitty-config
# - cloudkitty-command-bin
# TODO Change the keystone library to support adding
# a user to a domain without specifying a project
- name: Ensure cloudkitty user - name: Ensure cloudkitty user
shell: | keystone:
. {{ ansible_env.HOME }}/openrc command: "ensure_user"
{{ cloudkitty_bin }}/openstack {{ keystone_service_adminuri_insecure | bool | ternary('--insecure','') }}\ endpoint: "{{ keystone_service_adminurl }}"
--os-identity-api-version=3 \ login_user: "{{ keystone_admin_user_name }}"
--os-auth-url={{ keystone_service_adminurl }} \ login_password: "{{ keystone_auth_admin_password }}"
--os-project-name={{ cloudkitty_project_name }} \ login_project_name: "{{ keystone_admin_tenant_name }}"
--os-project-domain-name={{ cloudkitty_project_domain_name }} \ user_name: "{{ cloudkitty_username }}"
--os-user-domain-name={{ cloudkitty_user_domain_name }} \ domain_name: "{{ cloudkitty_user_domain_name }}"
user \ password: "{{ cloudkitty_user_password }}"
create \ insecure: "{{ keystone_service_adminuri_insecure }}"
--or-show \
--domain {{ cloudkitty_user_domain_name }} \
--password {{ cloudkitty_user_password }} \
"{{ cloudkitty_username }}"
tags: tags:
- cloudkitty-domain - cloudkitty-domain
- cloudkitty-domain-setup - cloudkitty-domain-setup