use same systemd service files for all cluster names.

This removes the ability for multiple ceph clusters on the same hardware
but keeps the suport serface smaller without autogenerating systemd servixce
files.

See discussion here:

https://github.com/ceph/ceph/pull/4062

fix for bnc#915567

Signed-off-by: Owen Synge <osynge@suse.com>

diff --git a/src/ceph-disk b/src/ceph-disk
index a1511ba89e825211e3883e7ca81e5667903d5694..7e78b33759170f69d8dc1163a7c3b2fd75dd202f 100755 (executable)
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1879,16 +1879,14 @@ def start_daemon(
                 [
                     'systemctl',
                     'enable',
-                    'ceph-{cname}osd@{osd_id}'.format(osd_id=osd_id,
-                        cname=cname),
+                    'ceph-osd@{osd_id}'.format(osd_id=osd_id),
                     ],
                 )
             command_check_call(
                 [
                     'systemctl',
                     'start',
-                    'ceph-{cname}osd@{osd_id}'.format(osd_id=osd_id,
-                        cname=cname),
+                    'ceph-osd@{osd_id}'.format(osd_id=osd_id),
                     ],
                 )
         else:

diff --git a/systemd/ceph-mds@.service b/systemd/ceph-mds@.service
index 22a787d60b4156f7f3f25ce99baf48fa0144b7fb..536d14b86d90659da00fd7ced8ab3a92c5153df6 100644 (file)
--- a/systemd/ceph-mds@.service
+++ b/systemd/ceph-mds@.service
@@ -6,7 +6,6 @@ PartOf=ceph.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/ceph
-Environment=CLUSTER=ceph
 ExecStart=/usr/bin/ceph-mds -f --cluster ${CLUSTER} --id %i
 
 [Install]

diff --git a/systemd/ceph-mon@.service b/systemd/ceph-mon@.service
index 437ef4d21b4d2a5382d6bf53f28e13760042606c..19436c213a7a4bcd1fe4746eb575bc5ca82542a3 100644 (file)
--- a/systemd/ceph-mon@.service
+++ b/systemd/ceph-mon@.service
@@ -11,7 +11,6 @@ PartOf=ceph.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/ceph
-Environment=CLUSTER=ceph
 ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i
 
 [Install]

diff --git a/systemd/ceph-osd@.service b/systemd/ceph-osd@.service
index 09f51c5938bf5b5163df7193e780a7eff7358639..9aa5b38fa2dcd5458ec30e72afe0d81e126c3726 100644 (file)
--- a/systemd/ceph-osd@.service
+++ b/systemd/ceph-osd@.service
@@ -6,7 +6,6 @@ PartOf=ceph.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/ceph
-Environment=CLUSTER=ceph
 ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i
 ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
 LimitNOFILE=131072

diff --git a/systemd/ceph.env b/systemd/ceph.env
new file mode 100644 (file)
index 0000000..da1c6df
--- /dev/null
+++ b/systemd/ceph.env
@@ -0,0 +1 @@
+CLUSTER=fred