diff options
| author | Ade Lee <alee@redhat.com> | 2016-03-14 16:52:48 -0400 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2016-03-29 18:20:49 -0600 |
| commit | b15f7a6bce6d5c2adc066be2ce06e3fdbd56d002 (patch) | |
| tree | a5fdf90780440bafcabb257b4eafa7209dc3962e | |
| parent | 1b5d731f46e29c7129f0e985e77b693440754642 (diff) | |
| download | pki-b15f7a6bce6d5c2adc066be2ce06e3fdbd56d002.tar.gz pki-b15f7a6bce6d5c2adc066be2ce06e3fdbd56d002.tar.xz pki-b15f7a6bce6d5c2adc066be2ce06e3fdbd56d002.zip | |
Modify dnsdomainname test in pkispawn
We do a check for the dnsdomainname, which fails in Openstack
CI because this is not set. Instead of exiting, default to
the hostname.
(cherry picked from commit 795465f8620a0a10092435dce46e4cff93dbc20a)
| -rw-r--r-- | base/server/python/pki/server/deployment/pkimessages.py | 2 | ||||
| -rwxr-xr-x | base/server/sbin/pkidestroy | 2 | ||||
| -rwxr-xr-x | base/server/sbin/pkispawn | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/base/server/python/pki/server/deployment/pkimessages.py b/base/server/python/pki/server/deployment/pkimessages.py index cc9102161..c68a40db2 100644 --- a/base/server/python/pki/server/deployment/pkimessages.py +++ b/base/server/python/pki/server/deployment/pkimessages.py @@ -70,7 +70,7 @@ PKI_DIRECTORY_ALREADY_EXISTS_NOT_A_DIRECTORY_1 = \ PKI_DIRECTORY_MISSING_OR_NOT_A_DIRECTORY_1 = \ "Directory '%s' is either missing or is NOT a directory!" PKI_DNS_DOMAIN_NOT_SET = \ - "A valid DNS domain name MUST be established to use PKI services!" + "DNS domain name has not been set - using the hostname instead." PKI_FILE_ALREADY_EXISTS_1 = "File '%s' already exists!" PKI_FILE_ALREADY_EXISTS_NOT_A_FILE_1 = \ "File '%s' already exists BUT it is NOT a file!" diff --git a/base/server/sbin/pkidestroy b/base/server/sbin/pkidestroy index abc11dc8d..459b75596 100755 --- a/base/server/sbin/pkidestroy +++ b/base/server/sbin/pkidestroy @@ -91,7 +91,7 @@ def main(argv): config.pki_dns_domainname = str(dnsdomainname).rstrip('\n') if not len(config.pki_dns_domainname): print log.PKI_DNS_DOMAIN_NOT_SET - sys.exit(1) + config.pki_dns_domainname = config.pki_hostname except subprocess.CalledProcessError as exc: print log.PKI_SUBPROCESS_ERROR_1 % exc sys.exit(1) diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn index 7ab11a515..f362b9e92 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -92,7 +92,7 @@ def main(argv): config.pki_dns_domainname = str(dnsdomainname).rstrip('\n') if not len(config.pki_dns_domainname): print log.PKI_DNS_DOMAIN_NOT_SET - sys.exit(1) + config.pki_dns_domainname = config.pki_hostname except subprocess.CalledProcessError as exc: print log.PKI_SUBPROCESS_ERROR_1 % exc sys.exit(1) |