diff options
| author | Ade Lee <alee@redhat.com> | 2016-02-10 07:01:14 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2016-02-17 15:40:54 -0500 |
| commit | 944c44b7f1805fecbadfc31689d66f4c92e59272 (patch) | |
| tree | 4d63d1c07f35da248fc639a55f68a1b1e4fb8bac /base/server/sbin | |
| parent | 6947854a3ab6ee4f296a5f97850f5521572683a1 (diff) | |
| download | pki-944c44b7f1805fecbadfc31689d66f4c92e59272.tar.gz pki-944c44b7f1805fecbadfc31689d66f4c92e59272.tar.xz pki-944c44b7f1805fecbadfc31689d66f4c92e59272.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.
Diffstat (limited to 'base/server/sbin')
| -rwxr-xr-x | base/server/sbin/pkidestroy | 2 | ||||
| -rwxr-xr-x | base/server/sbin/pkispawn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/server/sbin/pkidestroy b/base/server/sbin/pkidestroy index 032c97984..12d37f2f3 100755 --- a/base/server/sbin/pkidestroy +++ b/base/server/sbin/pkidestroy @@ -91,7 +91,7 @@ def main(argv): config.pki_dns_domainname = dnsdomainname 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 7d839851f..5892a671f 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -93,7 +93,7 @@ def main(argv): config.pki_dns_domainname = dnsdomainname 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) |