From ddd951ba70e11fb6332f57e94a3b1a22ded08a39 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Tue, 14 Mar 2017 16:07:15 +0000
Subject: [PATCH] Package copy-schema-to-ca.py
This reverts commit f4c7f1dd8a9ce530a8291219a904686ee47e59c7.
---
freeipa.spec.in | 1 +
ipaserver/install/cainstance.py | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 93f996c5be670e0ae374a12a85c2465b8e740927..70482ceb65639465d60b0c48fd2ccd6eaa34e097 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -1475,6 +1475,7 @@ fi
# END
%dir %{_usr}/share/ipa
%{_usr}/share/ipa/wsgi.py*
+%{_usr}/share/ipa/copy-schema-to-ca.py*
%{_usr}/share/ipa/kdcproxy.wsgi
%{_usr}/share/ipa/*.ldif
%{_usr}/share/ipa/*.uldif
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index d6e467097808594756d947fa721b8cf10fe7d043..a52336fd71ffb44e3f7dfcc95656bd82065f41cd 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -1416,9 +1416,11 @@ def replica_ca_install_check(config, promote):
else:
logger.critical(
'The master CA directory server does not have necessary schema. '
- 'Please run copy-schema-to-ca.py on all CA masters.\n'
+ 'Please copy the following script to all CA masters and run it '
+ 'on them: %s\n'
'If you are certain that this is a false positive, use '
- '--skip-schema-check.')
+ '--skip-schema-check.',
+ os.path.join(paths.USR_SHARE_IPA_DIR, 'copy-schema-to-ca.py'))
sys.exit('IPA schema missing on master CA directory server')
--
2.17.2