Support deployment with flowd for SciTags

data/webdav-defaults.yaml

@@ -41,4 +41,5 @@ storm::webdav::file_buffer_size: 1048576
 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::voms_cache_entry_lifetime_sec: 300
+storm::webdav::scitag: false

files/etc/storm/flowd.cfg

@@ -0,0 +1,4 @@
+PLUGIN='np_api'
+BACKEND='udp_firefly'
+FLOW_MAP_API='https://www.scitags.org/api.json'
+IP_DISCOVERY_ENABLED=True

manifests/webdav.pp

@@ -193,6 +193,8 @@
 
   String $tape_wellknown_source,
 
+  Boolean $scitag,
+
 ) {
   contain storm::webdav::install
   contain storm::webdav::config

manifests/webdav/config.pp

@@ -83,6 +83,16 @@
     notice('Empty storage area list. No storage area has been defined and initialized.')
   }
 
+  if $storm::webdav::scitag {
+    file { '/etc/flowd/flowd.cfg' :
+      ensure   => file,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0644',
+      source   => "puppet:///modules/storm/etc/storm/flowd.cfg",
+    }
+  }
+
   # Directory '/etc/systemd/system/storm-webdav.service.d' is created by rpm
   $service_dir='/etc/systemd/system/storm-webdav.service.d'
 

manifests/webdav/install.pp

@@ -6,4 +6,18 @@
   package { 'storm-webdav':
     ensure  => '>=1.4.2',
   }
+  if $storm::webdav::scitag {
+    $el = $facts['os']['distro']['release']['major']
+    yumrepo { 'scitags-repo':
+      ensure   => present,
+      descr    => 'SciTags stable repo',
+      enabled  => 1,
+      gpgcheck => 0,
+      baseurl  => "https://linuxsoft.cern.ch/repos/scitags${el}al-stable/x86_64/os/",
+    }
+    package { 'python3-scitags':
+      ensure  => 'installed',
+      require => Yumrepo['scitags-repo'],
+    }
+  }
 }

manifests/webdav/service.pp

@@ -5,4 +5,10 @@
     ensure => running,
     enable => true,
   }
+  if $storm::webdav::scitag {
+    service { 'flowd':
+      ensure => running,
+      enable => true,
+    }
+  }
 }

spec/classes/storm/storm_webdav_install_spec.rb

@@ -3,6 +3,13 @@
 describe 'storm::webdav::install' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
+      let(:pre_condition) do
+        <<-EOF
+          class { 'storm::webdav':
+            scitag => false,
+          }
+        EOF
+      end
       let(:facts) do
         facts
       end

spec/classes/storm/storm_webdav_service_spec.rb

@@ -5,6 +5,11 @@
     context "on #{os}" do
       let(:pre_condition) do
         'include storm::webdav::install'
+        <<-EOF
+          class { 'storm::webdav':
+            scitag => false,
+          }
+        EOF
       end
 
       let(:facts) do

spec/classes/storm/storm_webdav_spec.rb

@@ -68,6 +68,8 @@
             'voms_trust_store_refresh_interval_sec' => 43201,
             'voms_cache_enabled' => false,
             'voms_cache_entry_lifetime_sec' => 301,
+
+            'scitag' => false,
           }
         end
 
@@ -302,6 +304,43 @@
           )
         end
       end
+
+      context 'Check deployment with SciTag support' do
+        let(:params) do
+          {
+            'scitag' => true,
+          }
+        end
+
+        case facts[:operatingsystemmajrelease]
+        when '9'
+          it 'scitags-repo is installed and enabled' do
+            is_expected.to contain_yumrepo('scitags-repo').with(
+              ensure: 'present',
+              baseurl: 'https://linuxsoft.cern.ch/repos/scitags9al-stable/x86_64/os/',
+              enabled: 1,
+              gpgcheck: 0,
+            )
+          end
+        end
+        it 'check sysconfig file' do
+          service_file = '/etc/systemd/system/storm-webdav.service.d/storm-webdav.conf'
+          is_expected.to contain_file(service_file).with(
+            ensure: 'file',
+          )
+          is_expected.to contain_file(service_file).with(content: %r{Environment="STORM_WEBDAV_SCITAG_ENABLED=true"})
+        end
+        it 'check flowd configuration files' do
+          flowd_cfg_file = '/etc/flowd/flowd.cfg'
+          is_expected.to contain_file(flowd_cfg_file).with(
+            ensure: 'file',
+          )
+        end
+        it 'check flowd rpm is installed' do
+          is_expected.to contain_package('python3-scitags')
+        end
+        it { is_expected.to contain_service('flowd').with(ensure: 'running') }
+      end
     end
   end
 end

templates/etc/systemd/system/storm-webdav.service.d/storm-webdav.conf.erb

@@ -176,4 +176,8 @@ Environment="STORM_WEBDAV_VOMS_CACHE_ENABLE=<%=scope.lookupvar('storm::webdav::v
 
 # Cache entries lifetime, used if caching for VOMS certificate validation is enabled
 # Default: 300
-Environment="STORM_WEBDAV_VOMS_CACHE_ENTRY_LIFETIME_SEC=<%=scope.lookupvar('storm::webdav::voms_cache_entry_lifetime_sec')%>"
+Environment="STORM_WEBDAV_VOMS_CACHE_ENTRY_LIFETIME_SEC=<%=scope.lookupvar('storm::webdav::voms_cache_entry_lifetime_sec')%>"
+
+# Enable SciTags support
+# Default: false
+Environment="STORM_WEBDAV_SCITAG_ENABLED=<%=scope.lookupvar('storm::webdav::scitag')%>"