Remove dependency on the Keystone admin auth token

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

Change-Id: Ieb9c668eb68f6cac7f0bcb41c0211511fa154b38
This commit is contained in:
Jimmy McCrory 2016-03-17 14:51:39 -07:00
parent 1930e33fba
commit 0521851e7e
2 changed files with 15 additions and 4 deletions

View File

@ -16,8 +16,10 @@
- name: Ensure the service for Magnum exists
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 }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
service_name: "{{ magnum_service_name }}"
service_type: "{{ magnum_service_type }}"
@ -34,8 +36,10 @@
- name: Ensure the magnum user exists
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 }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
user_name: "{{ magnum_service_user_name }}"
tenant_name: "{{ magnum_service_project_name }}"
@ -53,8 +57,10 @@
- name: Ensure the magnum user has the 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: "{{ magnum_service_user_name }}"
tenant_name: "{{ magnum_service_project_name }}"
role_name: "{{ item }}"
@ -72,8 +78,10 @@
- name: Ensure the magnum endpoint is registered
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 }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
region_name: "{{ magnum_service_region }}"
service_name: "{{ magnum_service_name }}"

View File

@ -22,3 +22,6 @@
external_lb_vip_address: 172.16.24.1
internal_lb_vip_address: 192.168.0.1
magnum_galera_address: "{{ internal_lb_vip_address }}"
keystone_admin_user_name: admin
keystone_admin_tenant_name: admin
keystone_auth_admin_password: "SuperSecretePassword"