Merge pull request #125 from jouvin/cvmfs_autofs

CVMFS: autofs configuration made mandatory
quattor · Dec 5, 2018 · 075af74 · 075af74
2 parents a9e517d + 57e5a54
commit 075af74
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/features/cvmfs/client.pan b/features/cvmfs/client.pan
@@ -107,25 +107,18 @@ include 'components/chkconfig/config';
 
 
 #
-# Configure autofs component, if already included
+# Configure autofs component
 #
 include 'components/autofs/config';
-'/software/components' = {
-    if (exists('/software/components/autofs/maps')) {
-        autofs = SELF['autofs'];
-        if(!is_defined(autofs['maps']['cvmfs'])) {
-            autofs['maps']['cvmfs'] = dict(
-                'enabled', true,
-                'preserve', true,
-                'mapname', '/etc/auto.cvmfs',
-                'type', 'program',
-                'mountpoint', '/cvmfs',
-            );
-        };
-        SELF['autofs'] = autofs;
-    };
-    SELF;
-};
+prefix '/software/components/autofs/maps';
+# Do not overwrite an existing cvmfs map definition
+'cvmfs' ?= dict(
+    'enabled', true,
+    'preserve', true,
+    'mapname', '/etc/auto.cvmfs',
+    'type', 'program',
+    'mountpoint', '/cvmfs',
+);
 
 
 #

diff --git a/features/cvmfs/config.pan b/features/cvmfs/config.pan
@@ -1,8 +1,4 @@
 unique template features/cvmfs/config;
 
 variable CVMFS_CLIENT_ENABLED ?= false;
-include {
-    if ((is_boolean(CVMFS_CLIENT_ENABLED) && CVMFS_CLIENT_ENABLED)) {
-        'features/cvmfs/client';
-    };
-};
+include if ( CVMFS_CLIENT_ENABLED ) 'features/cvmfs/client';