From: Owen Synge <osynge@suse.com>
Date: Tue, 5 May 2015 14:56:53 +0000 (+0200)
Subject: use same systemd service files for all cluster names.
X-Git-Tag: SES1-maint01~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6eaf97d4c744cc2f26eb80cf7c5dbceed45e16d;p=ceph.git

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 a1511ba89e82..7e78b3375917 100755
--- 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 22a787d60b41..536d14b86d90 100644
--- 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 437ef4d21b4d..19436c213a7a 100644
--- 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 09f51c5938bf..9aa5b38fa2dc 100644
--- 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
index 000000000000..da1c6df152ad
--- /dev/null
+++ b/systemd/ceph.env
@@ -0,0 +1 @@
+CLUSTER=fred