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