ceph.spec,debian: remove auto-generated self-signed mgr restful cert

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 277e376d7487cffdd563f7cb6662c96eaa6c3743..59751d4462472e1cda71b5de914b9362785ffb38 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -331,7 +331,6 @@ Requires:   python-CherryPy
 Requires:       python-Werkzeug
 %endif
 Requires:       python-pecan
-Requires(post):        openssl
 %description mgr
 ceph-mgr enables python modules that provide services (such as the REST
 module derived from Calamari) and expose CLI hooks.  ceph-mgr gathers
@@ -1182,13 +1181,6 @@ fi
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr
 
 %post mgr
-CERT="%{_sysconfdir}/ceph/ceph-mgr-restful.crt"
-PKEY="%{_sysconfdir}/ceph/ceph-mgr-restful.key"
-if [ ! -e "$CERT" -o ! -e "$PKEY" ]; then
-  openssl req -new -nodes -x509 \
-    -subj "/O=IT/CN=ceph-mgr-restful" \
-    -days 3650 -keyout "$PKEY" -out "$CERT" -extensions v3_ca
-fi
 %if 0%{?suse_version}
 if [ $1 -eq 1 ] ; then
   /usr/bin/systemctl preset ceph-mgr@\*.service ceph-mgr.target >/dev/null 2>&1 || :

diff --git a/debian/ceph-mgr.postinst b/debian/ceph-mgr.postinst
index d483d4dccf371a2050fb598339ed6f88798fbf02..6d38ccf09feb3ea3cc9c6255320485a61207be94 100644 (file)
--- a/debian/ceph-mgr.postinst
+++ b/debian/ceph-mgr.postinst
@@ -24,13 +24,6 @@ set -e
 
 case "$1" in
     configure)
-       CERT="/etc/ceph/ceph-mgr-restful.crt"
-       PKEY="/etc/ceph/ceph-mgr-restful.key"
-       if [ ! -e "$CERT" -o ! -e "$PKEY" ]; then
-           openssl req -new -nodes -x509 \
-               -subj "/O=IT/CN=ceph-mgr-restful" \
-               -days 3650 -keyout "$PKEY" -out "$CERT" -extensions v3_ca
-       fi
        [ -x /sbin/start ] && start ceph-mgr-all || :
 
        if ! dpkg-statoverride --list /var/lib/ceph/mgr >/dev/null

diff --git a/debian/control b/debian/control
index 4b70d2fa7b908acffdc246894995d6853e99b94a..cc3009f873831b86d2e33c5bac9e629fa5ae5299 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -163,7 +163,6 @@ Architecture: linux-any
 Depends: ceph-base (= ${binary:Version}),
          python-pecan,
          python-werkzeug,
-         openssl,
          ${misc:Depends},
          ${python:Depends},
         python-cherrypy3,