build/ops: drop sample.fetch_config

smithfarm: @liewegas Is src/fetch_config still needed? liewegas: i don't think so Signed-off-by: Nathan Cutler <[email protected]>
Ederpoll · Jun 15, 2017 · c43bbd8 · c43bbd8
1 parent 3ddbfcd
commit c43bbd8
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 29 deletions.
diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in
@@ -166,7 +166,6 @@ package() {
 		|| return 1
 
 	chmod 0644 $pkgdir$_docdir/ceph/sample.ceph.conf || return 1
-	chmod 0644 $pkgdir$_docdir/ceph/sample.fetch_config || return 1
 
 	# udev rules
 	install -m 0644 -D udev/50-rbd.rules $pkgdir$_udevrulesdir/50-rbd.rules || return 1
@@ -192,7 +191,6 @@ base() {
 		xfsprogs
 	"
 
-	_pkg $_docdir/ceph sample.ceph.conf sample.fetch_config
 	_pkg $_bindir crushtool monmaptool osdmaptool ceph-run ceph-detect-init
 	_pkg $_sbindir ceph-create-keys mount.ceph
 	_pkg $_libexecdir/ceph ceph_common.sh

diff --git a/ceph.spec.in b/ceph.spec.in
@@ -883,7 +883,6 @@ install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/sys
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
 chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
-chmod 0644 %{buildroot}%{_docdir}/ceph/sample.fetch_config
 
 # firewall templates and /sbin/mount.ceph symlink
 %if 0%{?suse_version}
@@ -930,7 +929,6 @@ rm -rf %{buildroot}
 %docdir %{_docdir}
 %dir %{_docdir}/ceph
 %{_docdir}/ceph/sample.ceph.conf
-%{_docdir}/ceph/sample.fetch_config
 %{_bindir}/crushtool
 %{_bindir}/monmaptool
 %{_bindir}/osdmaptool

diff --git a/debian/ceph-base.install b/debian/ceph-base.install
@@ -10,7 +10,6 @@ usr/lib/ceph/ceph_common.sh
 usr/lib/ceph/erasure-code/*
 usr/lib/rados-classes/*
 usr/share/doc/ceph/sample.ceph.conf
-usr/share/doc/ceph/sample.fetch_config
 usr/share/man/man8/ceph-debugpack.8
 usr/share/man/man8/ceph-deploy.8
 usr/share/man/man8/ceph-run.8

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1066,10 +1066,6 @@ endif(WITH_RADOSGW)
 install(FILES
   sample.ceph.conf
   DESTINATION ${CMAKE_INSTALL_DOCDIR})
-install(FILES
-  fetch_config
-  DESTINATION ${CMAKE_INSTALL_DOCDIR}
-  RENAME sample.fetch_config)
 
 # Now create a useable config.h
 configure_file(

diff --git a/src/fetch_config b/src/fetch_config