Merge "Make the project_name for authentication configurable"
This commit is contained in:
commit
f10750d6bf
|
@ -132,7 +132,7 @@ def install(opts):
|
|||
config.set('service_credentials', 'username', 'nova')
|
||||
config.set('service_credentials', 'auth_type', 'password')
|
||||
config.set('service_credentials', 'project_domain_name', 'default')
|
||||
config.set('service_credentials', 'project_name', 'service')
|
||||
config.set('service_credentials', 'project_name', opts.project_name)
|
||||
config.set('service_credentials', 'user_domain_id', 'default')
|
||||
|
||||
if not config.has_section('keystone_authtoken'):
|
||||
|
@ -140,7 +140,7 @@ def install(opts):
|
|||
|
||||
config.set('keystone_authtoken', 'memcached_servers',
|
||||
'%s:11211' % keystone_url.hostname)
|
||||
config.set('keystone_authtoken', 'project_name', 'service')
|
||||
config.set('keystone_authtoken', 'project_name', opts.project_name)
|
||||
config.set('keystone_authtoken', 'password', opts.nova_password)
|
||||
config.set('keystone_authtoken', 'username', 'nova')
|
||||
config.set('keystone_authtoken', 'auth_url', opts.keystone_auth_url)
|
||||
|
@ -185,7 +185,7 @@ def install(opts):
|
|||
if not config.has_section('vendordata_dynamic_auth'):
|
||||
config.add_section('vendordata_dynamic_auth')
|
||||
|
||||
config.set('vendordata_dynamic_auth', 'project_name', 'service')
|
||||
config.set('vendordata_dynamic_auth', 'project_name', opts.project_name)
|
||||
config.set('vendordata_dynamic_auth', 'password', opts.nova_password)
|
||||
config.set('vendordata_dynamic_auth', 'username', 'nova')
|
||||
config.set('vendordata_dynamic_auth', 'auth_url', opts.keystone_auth_url)
|
||||
|
@ -230,6 +230,8 @@ def parse_args():
|
|||
help='Keystone auth URL', default=None)
|
||||
parser.add_argument('--nova-password', dest='nova_password',
|
||||
help='Nova service user password', default=None)
|
||||
parser.add_argument('--project', dest='project_name',
|
||||
help='Keystone project', default='service')
|
||||
parser = configure_ipa.ipa_options(parser)
|
||||
|
||||
opts = parser.parse_args()
|
||||
|
|
Loading…
Reference in New Issue