Remove deprecated url configuration option

This used to handle IPA connectivity manually by using
python-requests so the URL was necessary. This was replaced
by using the IPA framework instead and the host(s) to
contact are handled by that.

Change-Id: I4009b044ad079fd97591a28d8f47d18621506d6e
This commit is contained in:
Rob Crittenden 2016-12-06 19:46:48 +00:00
parent 0de474d3b0
commit f178718979
4 changed files with 0 additions and 8 deletions

View File

@ -5,7 +5,6 @@ debug = True
auth_strategy=keystone
log_dir=/var/log/novajoin
keytab = /etc/nova/krb5.keytab
url = https://$MASTER/ipa/json
domain = $DOMAIN
cacert = /etc/ipa/ca.crt
connect_retries = 1

View File

@ -45,9 +45,6 @@ Authentication strategy to use
\fRkeytab\fB = \fI/etc/nova/krb5.keytab\fR
Keytab used to communicate with the IPA master
.TP
\fRurl\fB = \fIhttps://ipa.example.com/ipa/json\fR
URL to the IPA master. Only one is allowed.
.TP
\fRdomain\fB = \fIopenstack.example.com\fR
The DNS domain to use when creating the FQDN of an instance
.TP

View File

@ -27,9 +27,6 @@ service_opts = [
cfg.PortOpt('join_listen_port',
default=9090,
help='Port to listen on'),
cfg.StrOpt('url', default=None,
help='IPA JSON RPC URL (e.g. '
'https://ipa.host.domain/ipa/json)'),
cfg.StrOpt('keytab', default='/etc/krb5.keytab',
help='Kerberos client keytab file'),
cfg.StrOpt('domain', default='test',

View File

@ -119,7 +119,6 @@ def install(args):
logger.info('Installing default config files')
confopts = {'FQDN': args['hostname'],
'MASTER': api.env.server, # pylint: disable=no-member
'DOMAIN': api.env.domain, # pylint: disable=no-member
'KEYSTONE_AUTH_URL': args['keystone_auth_url'],
'NOVA_PASSWORD': args['nova_password'],