From 0793414035126d4200e4ccc35288c2bcbf6da0d8 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Thu, 29 Nov 2012 13:38:14 -0500
Subject: Removed unused pki_admin_domain_name.

---
 base/deploy/src/scriptlets/pkimessages.py |  3 ---
 base/deploy/src/scriptlets/pkiparser.py   | 14 ++++----------
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'base/deploy/src')

diff --git a/base/deploy/src/scriptlets/pkimessages.py b/base/deploy/src/scriptlets/pkimessages.py
index 09ad0cfc7..5f5520a15 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 6103ce9e5..d68c92545 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,
-- 
cgit