From ce00f622483e590f6509880633ad86b5473c923c Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Thu, 15 Sep 2016 16:09:08 -0400
Subject: [PATCH] Change config template to match upstream, drop
 keystone-identity

I compared join.conf with nova.conf and neutron.conf and made
it conform more closely to those two in configuration in thej
keystone_authtoken and service_credentials sections.
---
 files/join.conf.template | 25 +++++++++++++------------
 scripts/novajoin-install |  7 -------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/files/join.conf.template b/files/join.conf.template
index d311b0a..ee8f5f1 100644
--- a/files/join.conf.template
+++ b/files/join.conf.template
@@ -12,18 +12,19 @@ cacert = /etc/ipa/ca.crt
 connect_retries = 1
 
 [keystone_authtoken]
-auth_uri = $KEYSTONE_AUTH_URI
-admin_password = $NOVA_PASSWORD
-admin_user = nova
-admin_tenant_name = services
-identity_uri = $KEYSTONE_IDENTITY
-
-[service_credentials]
-region_name = RegionOne
+username = nova
+project_name = service
 auth_type = password
 auth_url = $KEYSTONE_AUTH_URL
-project_name = service
-project_domain_name = Default
-username = nova
-user_domain_name = Default
 password = $NOVA_PASSWORD
+auth_uri = $KEYSTONE_AUTH_URI
+
+[service_credentials]
+auth_url = $KEYSTONE_AUTH_URL
+auth_type = password
+password = $NOVA_PASSWORD
+project_domain_name = default
+project_name = service
+tenant_name = service
+user_domain_id=default
+username = nova
diff --git a/scripts/novajoin-install b/scripts/novajoin-install
index d14b459..0a780bc 100755
--- a/scripts/novajoin-install
+++ b/scripts/novajoin-install
@@ -155,7 +155,6 @@ def install(args):
                 'DOMAIN': api.env.domain,  # pylint: disable=no-member
                 'KEYSTONE_AUTH_URI': args['keystone_auth_uri'],
                 'KEYSTONE_AUTH_URL': args['keystone_auth_url'],
-                'KEYSTONE_IDENTITY': args['keystone_identity'],
                 'NOVA_PASSWORD': args['nova_password'],
                 }
 
@@ -260,8 +259,6 @@ def parse_args():
                         help='Keystone auth URI')
     parser.add_argument('--keystone-auth-url', dest='keystone_auth_url',
                         help='Keystone auth URL')
-    parser.add_argument('--keystone-identity', dest='keystone_identity',
-                        help='Keystone identity URI')
     parser.add_argument('--nova-password', dest='nova_password',
                         help='Nova service user password')
 
@@ -302,10 +299,6 @@ def parse_args():
         args['keystone_auth_url'] = user_input("Keystone auth URL", "",
                                                allow_empty=False)
 
-    if not args['keystone_identity']:
-        args['keystone_identity'] = user_input("Keystone identity URI", "",
-                                               allow_empty=False)
-
     if not args['nova_password']:
         try:
             args['nova_password'] = getpass.getpass("nova service Password: ")