XrootD: readd manager_domain

SUNET · Nov 28, 2024 · 09638a8 · 09638a8
1 parent 55fab88
commit 09638a8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/manifests/xrootd.pp b/manifests/xrootd.pp
@@ -2,6 +2,7 @@
 class sunet::xrootd(
   Array[Hash] $cms_allow_hosts,
   Array       $managers,
+  String      $manager_domain,
   String      $cms_port                 = '1213',
   String      $container_image          = 'docker.sunet.se/staas/xrootd-s3-http',
   String      $container_tag            = '0.17.0-1',

diff --git a/templates/xrootd/xrootd-manager.cfg.erb b/templates/xrootd/xrootd-manager.cfg.erb
@@ -17,12 +17,7 @@ all.export  <%= @export %>
 # Set the role to either proxy manager or proxy server
 all.adminpath <%= @xrootd_admin_path %>
 all.pidpath <%= @xrootd_admin_path %>
-<%- @cms_allow_hosts.each do |extra_host| -%>
-<%- if @managers.include?(extra_host['name']) -%>
-all.manager all <%= extra_host['name'].split('.')[0] %> <%= @xrootd_port %> 
-all.manager all <%= extra_host['name'] %> <%= @xrootd_port %> 
-<%- end -%>
-<%- end -%>
+all.manager all <%= @manager_domain %>+ <%= @xrootd_port %> 
 all.role manager
 
 # Tell the cmsd which machines are allowed to connects

diff --git a/templates/xrootd/xrootd-server.cfg.erb b/templates/xrootd/xrootd-server.cfg.erb
@@ -17,12 +17,7 @@ all.export  <%= @export %>
 # Set the role to either proxy manager or proxy server
 all.adminpath <%= @xrootd_admin_path %>
 all.pidpath <%= @xrootd_admin_path %>
-<%- @cms_allow_hosts.each do |extra_host| -%>
-<%- if @managers.include?(extra_host['name']) -%>
-all.manager all <%= extra_host['name'].split('.')[0] %> <%= @xrootd_port %> 
-all.manager all <%= extra_host['name'] %> <%= @xrootd_port %> 
-<%- end -%>
-<%- end -%>
+all.manager all <%= @manager_domain %>+ <%= @xrootd_port %> 
 all.role server
 
 # Tell the cmsd which machines are allowed to connects