Skip to content

Commit

Permalink
ncm-nfs: Replace all references to CephFS
Browse files Browse the repository at this point in the history
  • Loading branch information
jrha committed Dec 8, 2017
1 parent 1e99b83 commit d3e8193
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions ncm-nfs/src/main/perl/nfs.pm
Expand Up @@ -7,7 +7,7 @@ nfs: NCM component for /etc/exports and /etc/fstab
=head1 DESCRIPTION
The I<nfs> component manages entries for C<NFS> in the C</etc/exports>
and/or C<NFS>/C<NFSv4>/C<CephFS>/C<PanFS>/C<bind> mount in the C</etc/fstab> files.
and/or C<NFS>/C<NFSv4>/C<Ceph>/C<PanFS>/C<bind> mount in the C</etc/fstab> files.
=head1 Example
Expand Down Expand Up @@ -261,7 +261,7 @@ The current managed entries are
=over
=item devices with filesystems C<nfs>, C<nfs4>, C<panfs> or C<cephfs>.
=item devices with filesystems C<nfs>, C<nfs4>, C<panfs> or C<ceph>.
=item bind mounts (filesystem C<none> and mount option C<bind>)
Expand Down Expand Up @@ -302,7 +302,7 @@ sub fstab
my $fh = CAF::FileWriter->new($FSTAB, backup => ".old", log => $self);

# Keep updated with filter below
my $mngd_by = "nfs/nfs4/panfs/cephfs filesystems and bind mounts";
my $mngd_by = "nfs/nfs4/panfs/ceph filesystems and bind mounts";

# Collect information for fstab file.
print $fh "# File edited by ncm-nfs\n";
Expand Down
2 changes: 1 addition & 1 deletion ncm-nfs/src/test/perl/fstab.t
Expand Up @@ -150,7 +150,7 @@ my $nfs2 = {
my $nfs3 = {
device => "mydev3",
mountpoint => "/mount3",
fstype => "cephfs",
fstype => "ceph",
options => "name=user,secretfile=/etc/ceph/secret",
freq => 0,
passno => 0,
Expand Down
4 changes: 2 additions & 2 deletions ncm-nfs/src/test/resources/regexps/fstab
Expand Up @@ -3,12 +3,12 @@ modified fstab entry
quote
---
# File edited by ncm-nfs
# Only nfs/nfs4/panfs/cephfs filesystems and bind mounts managed by ncm-nfs component.
# Only nfs/nfs4/panfs/ceph filesystems and bind mounts managed by ncm-nfs component.
# Comment
/dev00 /mntpt00 ext4 special,defaults 1
/dev01 /mntpt01 ext3
# Extra trailing comment
/mydev0 /mount000 nfs defaults 0 0
mydev1 /mount1 panfs super,awesome 5 100
amydev2 /amount2 none bind 0 0
mydev3 /mount3 cephfs name=user,secretfile=/etc/ceph/secret 0 0
mydev3 /mount3 ceph name=user,secretfile=/etc/ceph/secret 0 0

0 comments on commit d3e8193

Please sign in to comment.