feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #3894 from mvollman/osd_ceph_conf

Browse Source 
ceph: fix encrypted osd startup
This commit is contained in:
Sébastien Han
2019-09-25 09:00:06 +02:00
committed by GitHub
parent 24fc94cc57 e12bbd6f7c
commit a42cc44d11
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/cluster/osd/spec.go
+6
View File
@@ -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,
pkg/operator/ceph/cluster/osd/spec_test.go
+1 -1
View File
@@ -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]