x
/
novajoin
Code Issues Proposed changes

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.
This commit is contained in:
Rob Crittenden 2016-09-15 16:09:08 -04:00
parent 40d024f4a3
commit ce00f62248
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
files/join.conf.template
View File

@ -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

7
scripts/novajoin-install
View File

@ -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: ")