Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ncm-nfs: mount type for cephfs is ceph #1194

Merged
merged 3 commits into from Dec 19, 2017
Merged

ncm-nfs: mount type for cephfs is ceph #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a411614
ncm-nfs: mount type for cephfs is ceph
kwaegema Nov 24, 2017
28a68d1
ncm-nfs: Fix test for cephfs
kwaegema Nov 24, 2017
3baa9ee
ncm-nfs: Replace all references to CephFS
jrha Dec 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ncm-nfs/src/main/pan/components/nfs/schema.pan
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ type structure_nfs_exports = {
type structure_nfs_mounts = {
'device' : string
'mountpoint' : string
'fstype' : string with match(SELF, '^(nfs4?|(pan|ceph)fs|none)$')
'fstype' : string with match(SELF, '^(nfs4?|panfs|ceph|none)$')
'options' ? string
'freq' ? long(0..)
'passno' ? long(0..)
Expand Down
6 changes: 3 additions & 3 deletions ncm-nfs/src/main/perl/nfs.pm
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ncm-nfs/src/test/resources/fstab_simple.pan
View file
Open in desktop
Expand Up @@ -24,5 +24,5 @@ prefix "/software/components/nfs/mounts/2";
prefix "/software/components/nfs/mounts/3";
"device" = "mydev3";
"mountpoint" = "/mount3";
"fstype" = "cephfs";
"fstype" = "ceph";
"options" = "name=user,secretfile=/etc/ceph/secret";
4 changes: 2 additions & 2 deletions ncm-nfs/src/test/resources/regexps/fstab
View file
Open in desktop
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