Merge pull request #60 from lsst-it/remove-avro-templates

Remove avro templates setting from the config file

REFERENCE.md

@@ -34,7 +34,6 @@ The following parameters are available in the `ccs_sal` class:
 * [`kafka_registry_url`](#-ccs_sal--kafka_registry_url)
 * [`kafka_sasl_username`](#-ccs_sal--kafka_sasl_username)
 * [`kafka_sasl_password`](#-ccs_sal--kafka_sasl_password)
-* [`kafka_templates_directory`](#-ccs_sal--kafka_templates_directory)
 * [`lfa`](#-ccs_sal--lfa)
 * [`prefix_service`](#-ccs_sal--prefix_service)
 * [`rpm_repo`](#-ccs_sal--rpm_repo)
@@ -148,14 +147,6 @@ String giving SASL password
 
 Default value: `'password'`
 
-##### <a name="-ccs_sal--kafka_templates_directory"></a>`kafka_templates_directory`
-
-Data type: `String`
-
-String giving location of templates directory
-
-Default value: `'/home/tonyj/avro-templates'`
-
 ##### <a name="-ccs_sal--lfa"></a>`lfa`
 
 Data type: `Hash`

manifests/etc.pp

@@ -37,11 +37,10 @@
     file { "${dir}/${kafka_salfile}":
       ensure  => file,
       content => epp("${ptitle}/${kafka_salfile}.epp", {
-          'templates_directory' => $ccs_sal::kafka_templates_directory,
-          'broker_address'      => $ccs_sal::kafka_broker_address,
-          'sasl_username'       => $ccs_sal::kafka_sasl_username,
-          'sasl_password'       => $ccs_sal::kafka_sasl_password,
-          'registry_url'        => $ccs_sal::kafka_registry_url,
+          'broker_address' => $ccs_sal::kafka_broker_address,
+          'sasl_username'  => $ccs_sal::kafka_sasl_username,
+          'sasl_password'  => $ccs_sal::kafka_sasl_password,
+          'registry_url'   => $ccs_sal::kafka_registry_url,
         },
       ),
       *       => $attributes,

manifests/init.pp

@@ -29,8 +29,6 @@
 #   String giving SASL username
 # @param kafka_sasl_password
 #   String giving SASL password
-# @param kafka_templates_directory
-#   String giving location of templates directory
 # @param lfa
 #   Hash of properties (id, secret, endpoint, bucket) for large file
 #   annex (lfa) configuration.
@@ -65,7 +63,6 @@
   String $kafka_registry_url = 'https://tucson-teststand.lsst.codes/schema-registry',
   String $kafka_sasl_password = 'password',
   String $kafka_sasl_username = 'username',
-  String $kafka_templates_directory = '/home/tonyj/avro-templates', # FIXME
   Hash $lfa = {},
   Boolean $prefix_service = true,
   ## Old: http://www.slac.stanford.edu/~gmorris/lsst/pkgarchive

templates/setup-sal-kafka.epp

@@ -1,11 +1,9 @@
-<%- | String $templates_directory,
-      String $broker_address,
+<%- | String $broker_address,
       String $sasl_username,
       String $sasl_password,
       String $registry_url,
 | -%>
 # This file is managed by Puppet; changes may be overwritten.
-export LSST_AVRO_TEMPLATES=<%= $templates_directory %>
 export LSST_KAFKA_BROKER_ADDR=<%= $broker_address %>
 export LSST_SECURITY_PROTOCOL=SASL_SSL
 export LSST_SASL_USERNAME=<%= $sasl_username %>