merge develop -Dorg -Ssuccess-only: PR 6395 (Update IceGrid templates…

… to make the OMERO.tables module configurable)
snoopycrimecop · Jul 12, 2024 · 7c0d788 · 7c0d788
2 parents 38cfe99 + 89a9772
commit 7c0d788
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/etc/omero.properties b/etc/omero.properties
@@ -205,7 +205,9 @@ omero.server.nodedescriptors=
 #############################################
 _omero.glacier2.IceSSL.Ciphers.darwin=(AES)
 
-
+## (For documentation only)
+# Name of the Python module to use when starting the Tables service
+omero.tables.module=runTables
 
 #############################################
 ## Server product name for release artifacts

diff --git a/etc/templates/grid/default.xml b/etc/templates/grid/default.xml
@@ -21,6 +21,7 @@
     <variable name="ROUTERPORT"    value="@omero.ports.prefix@@omero.ports.ssl@"/>
     <variable name="INSECUREROUTER" value="OMERO.Glacier2/router:tcp -p @omero.ports.prefix@@omero.ports.tcp@ -h @omero.host@"/>
     <variable name="SEP"           value=":"/>
+    <variable name="TABLES_MODULE" value="@omero.tables.module@"/>
 
     <properties id="Profile">
       <!--

diff --git a/etc/templates/grid/templates.xml b/etc/templates/grid/templates.xml
@@ -350,7 +350,7 @@
       <parameter name="exe" default="${PYTHON}"/>
       <server id="Tables-${index}" exe="${exe}" activation="always" pwd="${OMERO_HOME}">
         <option>-m</option>
-        <option>runTables</option>
+        <option>${TABLES_MODULE}</option>
         <adapter name="TablesAdapter" endpoints="tcp">
           <object identity="Tables-${index}" type="::omero::grid::Tables"/>
         </adapter>