openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Remove dependency on the Keystone admin auth token

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

Change-Id: I0796c3eb16deeda9021ba39b02840499fca3fa1c
This commit is contained in:
Travis Truman 2016-03-17 10:32:28 -04:00
parent 8bdb2e2626
commit 742859c101
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tasks/nova_service_add.yml
View File

@ -17,8 +17,10 @@
- name: Ensure nova service - name: Ensure nova service
keystone: keystone:
command: "ensure_service" command: "ensure_service"
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 }}"
service_name: "{{ service_name }}" service_name: "{{ service_name }}"
service_type: "{{ service_type }}" service_type: "{{ service_type }}"
description: "{{ service_description }}" description: "{{ service_description }}"
@ -36,8 +38,10 @@
- name: Ensure nova user - name: Ensure nova user
keystone: keystone:
command: "ensure_user" command: "ensure_user"
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 }}"
user_name: "{{ service_user_name }}" user_name: "{{ service_user_name }}"
tenant_name: "{{ service_tenant_name }}" tenant_name: "{{ service_tenant_name }}"
password: "{{ service_password }}" password: "{{ service_password }}"
@ -56,8 +60,10 @@
- name: Ensure nova user to admin role - name: Ensure nova user to admin role
keystone: keystone:
command: "ensure_user_role" command: "ensure_user_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 }}"
user_name: "{{ service_user_name }}" user_name: "{{ service_user_name }}"
tenant_name: "{{ service_tenant_name }}" tenant_name: "{{ service_tenant_name }}"
role_name: "{{ nova_service_role_name }}" role_name: "{{ nova_service_role_name }}"
@ -76,8 +82,10 @@
- name: Ensure nova endpoint - name: Ensure nova endpoint
keystone: keystone:
command: "ensure_endpoint" command: "ensure_endpoint"
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 }}"
region_name: "{{ service_region }}" region_name: "{{ service_region }}"
service_name: "{{ service_name }}" service_name: "{{ service_name }}"
service_type: "{{ service_type }}" service_type: "{{ service_type }}"

3
tests/test.yml
View File

@ -286,7 +286,8 @@
rabbitmq_servers: 10.100.100.101 rabbitmq_servers: 10.100.100.101
rabbitmq_use_ssl: true rabbitmq_use_ssl: true
rabbitmq_port: 5671 rabbitmq_port: 5671
keystone_auth_admin_token: "SuperSecreteTestToken" keystone_admin_user_name: admin
keystone_admin_tenant_name: admin
keystone_auth_admin_password: "SuperSecretePassword" keystone_auth_admin_password: "SuperSecretePassword"
keystone_service_adminuri_insecure: false keystone_service_adminuri_insecure: false
keystone_service_internaluri_insecure: false keystone_service_internaluri_insecure: false