From d347cb134a6701381a38d4643511db7cc78fee0e Mon Sep 17 00:00:00 2001
From: Charles Farquhar <cfarquhar@cfarquhar.com>
Date: Thu, 13 Oct 2016 15:48:58 -0500
Subject: [PATCH] Configure ironic to use keystone v2

This change configures ironic to use keystone v2 because v3 support
was not fully implemented in mitaka.

Change-Id: I12797c838602b08f5862cf51a99cc0a2f1b72dfd
Closes-Bug: 1632436
---
 defaults/main.yml        |  5 -----
 templates/ironic.conf.j2 | 13 +++++--------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 22df7449..8a5df53e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -69,8 +69,6 @@ ironic_service_internalurl: "{{ ironic_service_internaluri }}"
 ironic_program_name: ironic-api
 ironic_service_region: RegionOne
 ironic_service_project_name: "service"
-ironic_service_project_domain_id: default
-ironic_service_user_domain_id: default
 ironic_service_role_name: "admin"
 ironic_service_in_ldap: False
 
@@ -98,9 +96,6 @@ ironic_automated_clean: false
 ironic_galera_user: ironic
 ironic_galera_database: ironic
 
-## Keystone authentication middleware
-ironic_keystone_auth_plugin: password
-
 # Integrated Openstack configuration
 ironic_openstack_driver_list: agent_ipmitool
 ironic_openstack_auth_strategy: keystone
diff --git a/templates/ironic.conf.j2 b/templates/ironic.conf.j2
index a3a7c875..a6b9c1c4 100644
--- a/templates/ironic.conf.j2
+++ b/templates/ironic.conf.j2
@@ -75,15 +75,12 @@ region_name = {{ ironic_service_region }}
 
 [keystone_authtoken]
 insecure = {{ keystone_service_internaluri_insecure | bool }}
-auth_type = {{ ironic_keystone_auth_plugin }}
 signing_dir = {{ ironic_system_home_folder }}/cache/api
-auth_url = {{ keystone_service_adminuri }}
-auth_uri = {{ keystone_service_internaluri }}
-project_domain_id = {{ ironic_service_project_domain_id }}
-user_domain_id = {{ ironic_service_user_domain_id }}
-project_name = {{ ironic_service_project_name }}
-username = {{ ironic_service_user_name }}
-password = {{ ironic_service_password }}
+identity_uri = {{ keystone_service_adminuri }}
+auth_uri = {{ keystone_service_internaluri }}/v2.0
+admin_tenant_name = {{ ironic_service_project_name }}
+admin_user = {{ ironic_service_user_name }}
+admin_password = {{ ironic_service_password }}
 
 memcached_servers = {{ memcached_servers }}