summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-11-29 13:38:14 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-11-29 13:38:14 -0500
commit0793414035126d4200e4ccc35288c2bcbf6da0d8 (patch)
treed4275c980baff799c07b2f1769ff9f74ba545fd4
parentc095e9730ab88d1c7f695c2b41efd8958584db69 (diff)
downloadpki-0793414035126d4200e4ccc35288c2bcbf6da0d8.zip
pki-0793414035126d4200e4ccc35288c2bcbf6da0d8.tar.gz
pki-0793414035126d4200e4ccc35288c2bcbf6da0d8.tar.xz
Removed unused pki_admin_domain_name.
-rw-r--r--base/deploy/config/deployment.cfg1
-rw-r--r--base/deploy/src/scriptlets/pkimessages.py3
-rw-r--r--base/deploy/src/scriptlets/pkiparser.py14
3 files changed, 4 insertions, 14 deletions
diff --git a/base/deploy/config/deployment.cfg b/base/deploy/config/deployment.cfg
index 278df62..b306ca3 100644
--- a/base/deploy/config/deployment.cfg
+++ b/base/deploy/config/deployment.cfg
@@ -59,7 +59,6 @@ destroy_scriplets=
###############################################################################
[Common]
pki_admin_cert_request_type=crmf
-pki_admin_domain_name=
pki_admin_dualkey=False
pki_admin_email=
pki_admin_keysize=2048
diff --git a/base/deploy/src/scriptlets/pkimessages.py b/base/deploy/src/scriptlets/pkimessages.py
index 09ad0cf..5f5520a 100644
--- a/base/deploy/src/scriptlets/pkimessages.py
+++ b/base/deploy/src/scriptlets/pkimessages.py
@@ -133,9 +133,6 @@ PKISPAWN_EPILOG =\
" Apache: 'pki_instance_name', 'pki_http_port', and 'pki_https_port'\n"\
" Tomcat: 'pki_instance_name', 'pki_http_port', 'pki_https_port',\n"\
" 'pki_ajp_port', and 'pki_tomcat_server_port'\n\n"\
-" Optionally, the 'pki_admin_domain_name' may be changed instead of, or\n"\
-" in addition to, the 'pki_instance_name' since a PKI instance is\n"\
-" defined as '${pki_instance_name}[.${pki_admin_domain_name}]'.\n\n"\
" Finally, if an optional '-p <prefix>' is defined, this value WILL NOT\n"\
" be prepended in front of the mandatory '-f <configuration_file>'.\n\n" +\
PKI_VERBOSITY
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py
index 6103ce9..d68c925 100644
--- a/base/deploy/src/scriptlets/pkiparser.py
+++ b/base/deploy/src/scriptlets/pkiparser.py
@@ -79,8 +79,7 @@ class PKIConfigParser:
dest='pki_deployed_instance_name',
action='store',
nargs=1, required=True, metavar='<instance>',
- help='FORMAT: ${pki_instance_name}'
- '[.${pki_admin_domain_name}]')
+ help='FORMAT: ${pki_instance_name}')
# Establish 'Optional' command-line options
optional = parser.add_argument_group('optional arguments')
optional.add_argument('-h', '--help',
@@ -338,17 +337,12 @@ class PKIConfigParser:
# OLD: "pki-${pki_subsystem}"
# (e. g. Tomcat: "pki-ca", "pki-kra", "pki-ocsp", "pki-tks")
# (e. g. Apache: "pki-ra", "pki-tps")
- # NEW: "${pki_instance_name}[.${pki_admin_domain_name}]"
+ # NEW: "${pki_instance_name}"
# (e. g. Tomcat: "pki-tomcat", "pki-tomcat.example.com")
# (e. g. Apache: "pki-apache", "pki-apache.example.com")
#
- if len(config.pki_master_dict['pki_admin_domain_name']):
- config.pki_master_dict['pki_instance_id'] =\
- config.pki_master_dict['pki_instance_name'] + "." +\
- config.pki_master_dict['pki_admin_domain_name']
- else:
- config.pki_master_dict['pki_instance_id'] =\
- config.pki_master_dict['pki_instance_name']
+ config.pki_master_dict['pki_instance_id'] =\
+ config.pki_master_dict['pki_instance_name']
# PKI Source name/value pairs
config.pki_master_dict['pki_source_conf_path'] =\
os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,