Rename scitag variable in scitag_enabled

italiangrid · Oct 17, 2024 · e47ada0 · e47ada0
1 parent dede27c
commit e47ada0
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/data/webdav-defaults.yaml b/data/webdav-defaults.yaml
@@ -42,4 +42,4 @@ storm::webdav::voms_trust_store_dir: '/etc/grid-security/vomsdir'
 storm::webdav::voms_trust_store_refresh_interval_sec: 43200
 storm::webdav::voms_cache_enabled: true
 storm::webdav::voms_cache_entry_lifetime_sec: 300
-storm::webdav::scitag: false
+storm::webdav::scitag_enabled: false
diff --git a/manifests/webdav.pp b/manifests/webdav.pp
@@ -193,7 +193,7 @@
 
   String $tape_wellknown_source,
 
-  Boolean $scitag,
+  Boolean $scitag_enabled,
 
 ) {
   contain storm::webdav::install

diff --git a/manifests/webdav/config.pp b/manifests/webdav/config.pp
@@ -83,7 +83,7 @@
     notice('Empty storage area list. No storage area has been defined and initialized.')
   }
 
-  if $storm::webdav::scitag {
+  if $storm::webdav::scitag_enabled {
     file { '/etc/flowd/flowd.cfg' :
       ensure   => file,
       owner    => 'root',

diff --git a/manifests/webdav/install.pp b/manifests/webdav/install.pp
@@ -6,7 +6,7 @@
   package { 'storm-webdav':
     ensure  => '>=1.4.2',
   }
-  if $storm::webdav::scitag {
+  if $storm::webdav::scitag_enabled {
     $el = $facts['os']['distro']['release']['major']
     yumrepo { 'scitags-repo':
       ensure   => present,

diff --git a/manifests/webdav/service.pp b/manifests/webdav/service.pp
@@ -5,7 +5,7 @@
     ensure => running,
     enable => true,
   }
-  if $storm::webdav::scitag {
+  if $storm::webdav::scitag_enabled {
     service { 'flowd':
       ensure => running,
       enable => true,

diff --git a/spec/classes/storm/storm_webdav_install_spec.rb b/spec/classes/storm/storm_webdav_install_spec.rb
@@ -6,7 +6,7 @@
       let(:pre_condition) do
         <<-EOF
           class { 'storm::webdav':
-            scitag => false,
+            scitag_enabled => false,
           }
         EOF
       end

diff --git a/spec/classes/storm/storm_webdav_service_spec.rb b/spec/classes/storm/storm_webdav_service_spec.rb
@@ -7,7 +7,7 @@
         'include storm::webdav::install'
         <<-EOF
           class { 'storm::webdav':
-            scitag => false,
+            scitag_enabled => false,
           }
         EOF
       end

diff --git a/spec/classes/storm/storm_webdav_spec.rb b/spec/classes/storm/storm_webdav_spec.rb
@@ -69,7 +69,7 @@
             'voms_cache_enabled' => false,
             'voms_cache_entry_lifetime_sec' => 301,
 
-            'scitag' => false,
+            'scitag_enabled' => false,
           }
         end
 
@@ -308,7 +308,7 @@
       context 'Check deployment with SciTag support' do
         let(:params) do
           {
-            'scitag' => true,
+            'scitag_enabled' => true,
           }
         end
 

diff --git a/templates/etc/systemd/system/storm-webdav.service.d/storm-webdav.conf.erb b/templates/etc/systemd/system/storm-webdav.service.d/storm-webdav.conf.erb
@@ -180,4 +180,4 @@ Environment="STORM_WEBDAV_VOMS_CACHE_ENTRY_LIFETIME_SEC=<%=scope.lookupvar('stor
 
 # Enable SciTags support
 # Default: false
-Environment="STORM_WEBDAV_SCITAG_ENABLED=<%=scope.lookupvar('storm::webdav::scitag')%>"
+Environment="STORM_WEBDAV_SCITAG_ENABLED=<%=scope.lookupvar('storm::webdav::scitag_enabled')%>"