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