upstart: Make instance jobs export their cluster and id variables.

This allows other jobs listening to Upstart "started ceph-mon" events
to see what instance started.

Signed-off-by: Tommi Virtanen <tv@inktank.com>

diff --git a/src/upstart/ceph-mds.conf b/src/upstart/ceph-mds.conf
index 56aa5bce6b520b894e258b64f195c529dd06df28..0d572798417445925569097378de29618d53a29d 100644 (file)
--- a/src/upstart/ceph-mds.conf
+++ b/src/upstart/ceph-mds.conf
@@ -15,6 +15,8 @@ pre-start script
 end script
 
 instance ${cluster:-ceph}/$id
+export cluster
+export id
 
 # this breaks oneiric
 #usage "cluster = name of cluster (defaults to 'ceph'); id = mds instance id"

diff --git a/src/upstart/ceph-mon.conf b/src/upstart/ceph-mon.conf
index b38eff309f02b3c5bbe1f5c979f12ac9b92d6761..2cf7bfa5b2ea53c055f1f315a5f09f5c73a3407a 100644 (file)
--- a/src/upstart/ceph-mon.conf
+++ b/src/upstart/ceph-mon.conf
@@ -15,6 +15,8 @@ pre-start script
 end script
 
 instance ${cluster:-ceph}/$id
+export cluster
+export id
 
 # this breaks oneiric
 #usage "cluster = name of cluster (defaults to 'ceph'); id = monitor instance id"

diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
index cff5f431d3000b4804b91f65108d13bd9e4dcf67..7a976c2397a427f42ff858bda789ca5f1e383eb9 100644 (file)
--- a/src/upstart/ceph-osd.conf
+++ b/src/upstart/ceph-osd.conf
@@ -30,5 +30,7 @@ pre-start script
 end script
 
 instance ${cluster:-ceph}/$id
+export cluster
+export id
 
 exec /usr/bin/ceph-osd --cluster="${cluster:-ceph}" -i "$id" -f

diff --git a/src/upstart/radosgw.conf b/src/upstart/radosgw.conf
index d809f8861e11ce9059ed69c3127fe394834a7bca..deaa139e8cb8b62541c7b6d707065eb9d663c6eb 100644 (file)
--- a/src/upstart/radosgw.conf
+++ b/src/upstart/radosgw.conf
@@ -15,6 +15,8 @@ pre-start script
 end script
 
 instance ${cluster:-ceph}/$id
+export cluster
+export id
 
 # this breaks oneiric
 #usage "cluster = name of cluster (defaults to 'ceph'); id = mds instance id"