Merge pull request #41 from lsst-it/java17

(setup-sal5) allow customization of the LD_PRELOAD string

REFERENCE.md

@@ -26,6 +26,7 @@ The following parameters are available in the `ccs_sal` class:
 * [`dds`](#-ccs_sal--dds)
 * [`dds_domain`](#-ccs_sal--dds_domain)
 * [`dds_interface`](#-ccs_sal--dds_interface)
+* [`dds_extra`](#-ccs_sal--dds_extra)
 * [`instrument`](#-ccs_sal--instrument)
 * [`kafka`](#-ccs_sal--kafka)
 * [`kafka_broker_address`](#-ccs_sal--kafka_broker_address)
@@ -80,6 +81,14 @@ String giving name of SAL interface (eg somehost-dds)
 
 Default value: `'localhost-dds'`
 
+##### <a name="-ccs_sal--dds_extra"></a>`dds_extra`
+
+Data type: `String`
+
+String giving extra content for DDS setup file.
+
+Default value: `'export LD_PRELOAD=${JAVA_HOME}/jre/lib/amd64/libjsig.so'`
+
 ##### <a name="-ccs_sal--instrument"></a>`instrument`
 
 Data type: `String`

manifests/etc.pp

@@ -55,6 +55,7 @@
           'domain'    => $ccs_sal::dds_domain,
           'interface' => $ccs_sal::dds_interface,
           'home'      => $ccs_sal::ospl_home,
+          'extra'     => $ccs_sal::dds_extra,
         },
       ),
       *       => $attributes,

manifests/init.pp

@@ -12,6 +12,8 @@
 #   String giving LSST_DDS_DOMAIN (eg base)
 # @param dds_interface
 #   String giving name of SAL interface (eg somehost-dds)
+# @param dds_extra
+#   String giving extra content for DDS setup file.
 # @param instrument
 #   String giving instrument (eg comcam).
 # @param kafka
@@ -50,6 +52,7 @@
   Boolean $dds = true,
   String $dds_domain = 'summit',
   String $dds_interface = 'localhost-dds',
+  String $dds_extra = 'export LD_PRELOAD=${JAVA_HOME}/jre/lib/amd64/libjsig.so',
   String $instrument = 'comcam',
   Boolean $kafka = false,
   String $kafka_broker_address = 'sasquatch-tts-kafka-bootstrap.lsst.codes:9094',

templates/setup-sal5.epp

@@ -1,4 +1,8 @@
-<%- | String $domain, String $interface, String $home | -%>
+<%- | String $domain,
+      String $interface,
+      String $home,
+      Optional[String] $extra = undef
+| -%>
 # This file is managed by Puppet; changes may be overwritten.
 export LSST_DDS_PARTITION_PREFIX=<%= $domain %>
 export LSST_DDS_INTERFACE=<%= $interface %>
@@ -7,6 +11,8 @@ source $OSPL_HOME/release.com
 export OSPL_RELEASE=$(idlpp -v | sed -e 's|.*: ||')
 export JAVA_HOME=/usr/java/default
 export LD_LIBRARY_PATH=/opt/lsst/ts_sal/lib:$LD_LIBRARY_PATH
-export LD_PRELOAD=${JAVA_HOME}/jre/lib/amd64/libjsig.so
 export OSPL_URI=file:///etc/ccs/ospl-shmem.xml
 export LSST_DDS_QOS=file:///etc/ccs/QoS.xml
+<% unless $extra =~ Undef { -%>
+<%= $extra %>
+<% } -%>