Remove dependency on the Keystone admin auth token

Now that auth token usage is deprecated, prefer the admin
user and password for all designate tasks run against
keystone.

Change-Id: Ibfe282044d3cc234b4d627e351de08037c419b0b
This commit is contained in:
Jimmy McCrory 2016-03-17 14:49:11 -07:00
parent bf92ffb46d
commit daa3308d77
2 changed files with 14 additions and 4 deletions

View File

@ -16,8 +16,10 @@
- name: Ensure designate service
keystone:
command: "ensure_service"
token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}"
login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}"
service_name: "{{ designate_service_name }}"
service_type: "{{ designate_service_type }}"
description: "{{ designate_service_description }}"
@ -33,8 +35,10 @@
- name: Ensure designate user
keystone:
command: "ensure_user"
token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}"
login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}"
user_name: "{{ designate_service_user_name }}"
tenant_name: "{{ designate_service_project_name }}"
password: "{{ designate_service_password }}"
@ -51,8 +55,10 @@
- name: Ensure designate user to admin role
keystone:
command: "ensure_user_role"
token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}"
login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}"
user_name: "{{ designate_service_user_name }}"
tenant_name: "{{ designate_service_project_name }}"
role_name: "{{ designate_role_name }}"
@ -72,8 +78,10 @@
- name: Ensure designate endpoint
keystone:
command: "ensure_endpoint"
token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}"
login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}"
region_name: "{{ designate_service_region }}"
service_name: "{{ designate_service_name }}"
service_type: "{{ designate_service_type }}"

View File

@ -32,6 +32,8 @@ keystone_galera_address: 10.100.100.101
keystone_galera_database: keystone
keystone_container_mysql_password: "SuperSecrete"
keystone_auth_admin_token: "SuperSecreteTestToken"
keystone_admin_user_name: admin
keystone_admin_tenant_name: admin
keystone_auth_admin_password: "SuperSecretePassword"
keystone_service_adminuri_insecure: false
keystone_service_internaluri_insecure: false