From 24ecaed8081f0bfec3324f86423f80e5d29c99b3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Thu, 30 Mar 2017 09:32:31 +0200 Subject: [PATCH] systemd: remove all occurence of ceph-create-keys MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ceph-create-keys unit file does not exist anymore so there is no need to call it. Signed-off-by: Sébastien Han (cherry picked from commit 205cff12b3fe577a02db119ed3084d5c46ba76ce) --- ceph.spec.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index cad5864f40c9b..b4c5144e95088 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1118,7 +1118,7 @@ if [ $1 -eq 1 ] ; then fi %endif %if 0%{?fedora} || 0%{?rhel} -%systemd_post ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target +%systemd_post ceph-mon@\*.service ceph-mon.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-mon.target >/dev/null 2>&1 || : @@ -1126,20 +1126,20 @@ fi %preun mon %if 0%{?suse_version} -%service_del_preun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target +%service_del_preun ceph-mon@\*.service ceph-mon.target %endif %if 0%{?fedora} || 0%{?rhel} -%systemd_preun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target +%systemd_preun ceph-mon@\*.service ceph-mon.target %endif %postun mon test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" -%service_del_postun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target +%service_del_postun ceph-mon@\*.service ceph-mon.target %endif %if 0%{?fedora} || 0%{?rhel} -%systemd_postun ceph-create-keys@\*.service ceph-mon@\*.service ceph-mon.target +%systemd_postun ceph-mon@\*.service ceph-mon.target %endif if [ $FIRST_ARG -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to @@ -1149,7 +1149,7 @@ if [ $FIRST_ARG -ge 1 ] ; then source $SYSCONF_CEPH fi if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then - /usr/bin/systemctl try-restart ceph-create-keys@\*.service ceph-mon@\*.service > /dev/null 2>&1 || : + /usr/bin/systemctl try-restart ceph-mon@\*.service > /dev/null 2>&1 || : fi fi -- 2.39.5