Merge pull request #20 from genomicsengland/TNG

INFRA-891: Enable option to not use upstream repo

Author: wwentland

logstash/init.sls

@@ -1,13 +1,17 @@
 {%- from 'logstash/map.jinja' import logstash with context %}
 
+{%- if logstash.use_upstream_repo %}
 include:
   - .repo
+{%- endif %}
 
 logstash-pkg:
   pkg.{{logstash.pkgstate}}:
     - name: {{logstash.pkg}}
+    {%- if logstash.use_upstream_repo %}
     - require:
       - pkgrepo: logstash-repo
+    {%- endif %}
 
 # This gets around a user permissions bug with the logstash user/group
 # being able to read /var/log/syslog, even if the group is properly set for

logstash/map.jinja

@@ -1,11 +1,13 @@
 {% set logstash = salt['grains.filter_by']({
   'Debian': {
+    'use_upstream_repo': True,
     'pkg': 'logstash',
     'svc': 'logstash',
     'pkgstate': 'latest',
     'indent': 4
   },
   'RedHat': {
+    'use_upstream_repo': True,
     'pkg': 'logstash',
     'svc': 'logstash',
     'pkgstate': 'latest',