From b0982e138e6ad0830b1903d8f58c0d0a25d3ace4 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 80ae98c5515f64a8df8d981ad5e91b05c84e31c1..86189d56ded05dac695d3a7a19f726e197979dc5 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -1292,6 +1292,7 @@ fi
# END
%dir %{_usr}/share/ipa
%{_usr}/share/ipa/wsgi.py*
+%{_usr}/share/ipa/copy-schema-to-ca.py*
%{_usr}/share/ipa/*.ldif
%{_usr}/share/ipa/*.uldif
%{_usr}/share/ipa/*.template
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index cb8dc43096b8851d7554447f28c4537a35b47852..810ce882920490abc6fee4458082fe6611f317f5 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -1355,9 +1355,11 @@ def replica_ca_install_check(config, promote):
else:
root_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'))
exit('IPA schema missing on master CA directory server')
--
2.17.1