Remove dependency on the Keystone admin auth token
Now that auth token usage is deprecated, prefer the admin user and password for all horizon setup tasks run against keystone. Change-Id: I37187eaf11d3bd60c577acf7c97c7c2993d65566
This commit is contained in:
parent
1f52acc1c3
commit
788fbfd98d
@ -52,8 +52,9 @@ Example Playbook
|
|||||||
rabbitmq_servers: 10.100.100.101
|
rabbitmq_servers: 10.100.100.101
|
||||||
rabbitmq_use_ssl: false
|
rabbitmq_use_ssl: false
|
||||||
rabbitmq_port: 5671
|
rabbitmq_port: 5671
|
||||||
keystone_auth_admin_token: "SuperSecreteTestToken"
|
keystone_admin_user_name: admin
|
||||||
keystone_auth_admin_password: "SuperSecretePassword"
|
keystone_auth_admin_password: "SuperSecretePassword"
|
||||||
|
keystone_admin_tenant_name: admin
|
||||||
keystone_service_adminuri_insecure: false
|
keystone_service_adminuri_insecure: false
|
||||||
keystone_service_internaluri_insecure: false
|
keystone_service_internaluri_insecure: false
|
||||||
keystone_service_internaluri: "http://{{ internal_lb_vip_address }}:5000"
|
keystone_service_internaluri: "http://{{ internal_lb_vip_address }}:5000"
|
||||||
|
@ -18,14 +18,18 @@
|
|||||||
- name: Ensure default keystone user role
|
- name: Ensure default keystone user role
|
||||||
keystone:
|
keystone:
|
||||||
command: "ensure_role"
|
command: "ensure_role"
|
||||||
token: "{{ keystone_auth_admin_token }}"
|
|
||||||
endpoint: "{{ keystone_service_adminurl }}"
|
endpoint: "{{ keystone_service_adminurl }}"
|
||||||
|
login_user: "{{ keystone_admin_user_name }}"
|
||||||
|
login_password: "{{ keystone_auth_admin_password }}"
|
||||||
|
login_project_name: "{{ keystone_admin_tenant_name }}"
|
||||||
role_name: "{{ horizon_default_role_name }}"
|
role_name: "{{ horizon_default_role_name }}"
|
||||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||||
when: >
|
when:
|
||||||
keystone_auth_admin_token is defined
|
- keystone_admin_user_name is defined
|
||||||
and keystone_service_adminurl is defined
|
- keystone_auth_admin_password is defined
|
||||||
and keystone_service_adminuri_insecure is defined
|
- keystone_admin_tenant_name is defined
|
||||||
|
- keystone_service_adminurl is defined
|
||||||
|
- keystone_service_adminuri_insecure is defined
|
||||||
register: add_member_role
|
register: add_member_role
|
||||||
until: add_member_role|success
|
until: add_member_role|success
|
||||||
retries: 5
|
retries: 5
|
||||||
|
Loading…
Reference in New Issue
Block a user