diff --git a/pkg/operator/ceph/cluster/osd/spec.go b/pkg/operator/ceph/cluster/osd/spec.go index cf694f1e7..33c3a72a1 100644 --- a/pkg/operator/ceph/cluster/osd/spec.go +++ b/pkg/operator/ceph/cluster/osd/spec.go @@ -157,6 +157,12 @@ func (c *Cluster) makeDeployment(osdProps osdProperties, osd OSDInfo) (*apps.Dep {Name: "ROOK_OSD_UUID", Value: osd.UUID}, {Name: "ROOK_OSD_ID", Value: osdID}, {Name: "ROOK_OSD_STORE_TYPE", Value: storeType}, + {Name: "ROOK_CEPH_MON_HOST", + ValueFrom: &v1.EnvVarSource{ + SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{ + Name: "rook-ceph-config"}, + Key: "mon_host"}}}, + {Name: "CEPH_ARGS", Value: "-m $(ROOK_CEPH_MON_HOST)"}, }...) configEnvVars := append(c.getConfigEnvVars(osdProps.storeConfig, dataDir, osdProps.crushHostname, osdProps.location), []v1.EnvVar{ tiniEnvVar, diff --git a/pkg/operator/ceph/cluster/osd/spec_test.go b/pkg/operator/ceph/cluster/osd/spec_test.go index 88f70079b..73f9ce029 100644 --- a/pkg/operator/ceph/cluster/osd/spec_test.go +++ b/pkg/operator/ceph/cluster/osd/spec_test.go @@ -233,7 +233,7 @@ func TestStorageSpecDevicesAndDirectories(t *testing.T) { assert.Equal(t, "/var/lib/rook", cont.VolumeMounts[0].MountPath) assert.Equal(t, "/etc/ceph", cont.VolumeMounts[1].MountPath) - assert.Equal(t, (7 + len(k8sutil.ClusterDaemonEnvVars(c.cephVersion.Image))), len(cont.Env)) + assert.Equal(t, (9 + len(k8sutil.ClusterDaemonEnvVars(c.cephVersion.Image))), len(cont.Env)) require.Equal(t, 2, len(podSpec.InitContainers)) initCont = podSpec.InitContainers[0]