This check is unnecessary and is breaking continuous integration in
OpenStack. Removing from pkispawn/pkidestroy.
Ade
From 655f323131d6494bd1b6b40370c36ca5ef50af46 Mon Sep 17 00:00:00 2001
From: Ade Lee <[email protected]>
Date: Tue, 9 Feb 2016 11:46:11 -0500
Subject: [PATCH] Remove dnsdomainname check
This check is breaking CI tests in openstack where a
hostname is assigned without a domain. When this test is patched
out, the server works just fine, which implies that this check is
not strictly needed.
---
base/server/python/pki/server/deployment/pkimessages.py | 2 --
base/server/sbin/pkidestroy | 13 -------------
base/server/sbin/pkispawn | 12 ------------
3 files changed, 27 deletions(-)
diff --git a/base/server/python/pki/server/deployment/pkimessages.py b/base/server/python/pki/server/deployment/pkimessages.py
index b16051b6c19f1e6d8d88b7419781a11c5dee27f4..18b8e24ac1226504736db9b7fae797b8fdc256b2 100644
--- a/base/server/python/pki/server/deployment/pkimessages.py
+++ b/base/server/python/pki/server/deployment/pkimessages.py
@@ -68,8 +68,6 @@ PKI_DIRECTORY_ALREADY_EXISTS_NOT_A_DIRECTORY_1 = \
"Directory '%s' already exists BUT it is NOT a directory!"
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!"
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 032c97984280a8c6ef701acfdeced6a066f56801..a2f885ede83650769681bb4ab6b1a256949ab470 100755
--- a/base/server/sbin/pkidestroy
+++ b/base/server/sbin/pkidestroy
@@ -83,19 +83,6 @@ def main(argv):
# Retrieve hostname
config.pki_hostname = socket.getfqdn()
- # Retrieve DNS domainname
- config.pki_dns_domainname = None
- try:
- dnsdomainname = subprocess.check_output(["dnsdomainname"])
- dnsdomainname = dnsdomainname.decode('ascii').rstrip('\n')
- config.pki_dns_domainname = dnsdomainname
- if not len(config.pki_dns_domainname):
- print(log.PKI_DNS_DOMAIN_NOT_SET)
- sys.exit(1)
- except subprocess.CalledProcessError as exc:
- print(log.PKI_SUBPROCESS_ERROR_1 % exc)
- sys.exit(1)
-
# Read and process command-line arguments.
parser = PKIConfigParser(
'PKI Instance Removal',
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn
index 7d839851faa20ebd5b53b0dd3be2fc77e0a3f69f..ef2c2e512bb385bd75774e6f7866f0e881179650 100755
--- a/base/server/sbin/pkispawn
+++ b/base/server/sbin/pkispawn
@@ -86,18 +86,6 @@ def main(argv):
# Retrieve hostname
config.pki_hostname = socket.getfqdn()
- # Retrieve DNS domainname
- try:
- dnsdomainname = subprocess.check_output(["dnsdomainname"])
- dnsdomainname = dnsdomainname.decode('ascii').rstrip('\n')
- config.pki_dns_domainname = dnsdomainname
- if not len(config.pki_dns_domainname):
- print(log.PKI_DNS_DOMAIN_NOT_SET)
- sys.exit(1)
- except subprocess.CalledProcessError as exc:
- print(log.PKI_SUBPROCESS_ERROR_1 % exc)
- sys.exit(1)
-
# Read and process command-line arguments.
parser = PKIConfigParser(
'PKI Instance Installation and Configuration',
--
2.4.3
_______________________________________________
Pki-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/pki-devel
