Merge pull request #15309 from rootfs/no_remount

rbd: no more remount.
This commit is contained in:
Dawn Chen 2015-10-12 16:02:53 -07:00
commit de22206929

View File

@ -201,18 +201,8 @@ func (b *rbdBuilder) SetUpAt(dir string) error {
err := diskSetUp(b.manager, *b, dir, b.mounter)
if err != nil {
glog.Errorf("rbd: failed to setup")
return err
}
globalPDPath := b.manager.MakeGlobalPDName(*b.rbd)
// make mountpoint rw/ro work as expected
//FIXME revisit pkg/util/mount and ensure rw/ro is implemented as expected
mode := "rw"
if b.ReadOnly {
mode = "ro"
}
b.plugin.execCommand("mount", []string{"-o", "remount," + mode, globalPDPath, dir})
return nil
return err
}
type rbdCleaner struct {