From 0ab481309222075cda38fe1977b09759daa722f4 Mon Sep 17 00:00:00 2001
From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 24 Mar 2016 11:59:33 +0100
Subject: [PATCH] script: subscription-manager support (part 2)

Strip the .py suffix so that no pyc / pyo files are generated.
Do not install on CentOS.

http://tracker.ceph.com/issues/14972 Fixes: #14972

Signed-off-by: Loic Dachary <loic@dachary.org>
---
 ceph.spec.in                     | 6 +++---
 configure.ac                     | 4 ++--
 src/Makefile.am                  | 4 ++--
 src/script/{subman.py => subman} | 0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename src/script/{subman.py => subman} (100%)

diff --git a/ceph.spec.in b/ceph.spec.in
index ac2b32b7b968..1fdeff6951be 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -685,7 +685,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
                 --libexecdir=%{_libexecdir} \
 		--localstatedir=/var \
 		--sysconfdir=/etc \
-%if 0%{?rhel}
+%if 0%{?rhel} && ! 0%{?centos}
                 --enable-subman \
 %endif
 %if 0%{?_with_systemd}
@@ -1189,8 +1189,8 @@ fi
 %{_mandir}/man8/ceph-clsinfo.8*
 %{_mandir}/man8/ceph-disk.8*
 %{_mandir}/man8/ceph-osd.8*
-%if 0%{?rhel}
-/etc/cron.hourly/subman.py
+%if 0%{?rhel} && ! 0%{?centos}
+/etc/cron.hourly/subman
 %endif
 %if 0%{?_with_systemd}
 %{_unitdir}/ceph-osd@.service
diff --git a/configure.ac b/configure.ac
index 20d50f3f50ea..48a7fc2bf60b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,8 +211,8 @@ AM_CONDITIONAL(ENABLE_SERVER, test "$enable_server" = "yes")
 AC_ARG_ENABLE([subman],
 	[AS_HELP_STRING([--enable-subman], [enable subman])],
 	[],
-	[enable_subman=yes])
-AM_CONDITIONAL([ENABLE_SUBMAN], test "$enable_subman" = "yes")
+	[enable_subman=no])
+AM_CONDITIONAL([ENABLE_SUBMAN], test "x$enable_subman" != "xno")
 
 # cython is required to build python bindings for libraries
 if test x"$with_cython" = xyes; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 528a74994a6e..1d8f8bbe36e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,7 +107,7 @@ EXTRA_DIST += \
 	$(srcdir)/.git_version \
 	$(srcdir)/ceph-rbdnamer \
 	$(srcdir)/tools/ceph-monstore-update-crush.sh \
-	$(srcdir)/script/subman.py \
+	$(srcdir)/script/subman \
 	$(srcdir)/upstart/ceph-all.conf \
 	$(srcdir)/upstart/ceph-disk.conf \
 	$(srcdir)/upstart/ceph-mon.conf \
@@ -155,7 +155,7 @@ ceph_libexec_SCRIPTS = ceph_common.sh ceph-osd-prestart.sh
 
 if ENABLE_SUBMAN
 submandir = /etc/cron.hourly
-subman_SCRIPTS = script/subman.py
+subman_SCRIPTS = script/subman
 endif
 
 # tests to actually run on "make check"; if you need extra, non-test,
diff --git a/src/script/subman.py b/src/script/subman
similarity index 100%
rename from src/script/subman.py
rename to src/script/subman
-- 
2.47.3