Merge branch 'hotfix/packages' into 'master'
Do not force slack package in the defaults.
See merge request !2
diff --git a/jenkins/map.jinja b/jenkins/map.jinja
index 160bb35..bbcf637 100644
--- a/jenkins/map.jinja
+++ b/jenkins/map.jinja
@@ -14,7 +14,7 @@
{% set job_builder = salt['grains.filter_by']({
'Debian': {
- 'pkgs': ['jenkins-job-builder', 'jenkins-jobs-slack'],
+ 'pkgs': ['jenkins-job-builder'],
'dir': {
'conf': '/etc/jenkins_jobs',
'base': '/srv/jenkins_jobs'
@@ -24,7 +24,7 @@
}
},
'RedHat': {
- 'pkgs': ['jenkins-job-builder', 'jenkins-jobs-slack'],
+ 'pkgs': ['jenkins-job-builder'],
'dir': {
'conf': '/etc/jenkins_jobs',
'base': '/srv/jenkins_jobs'
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index eb91c01..0d27f12 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -12,6 +12,8 @@
network: any
port: 8080
protocol: http
+ pkgs:
+ - jenkins-jobs-slack
plugins:
- name: git
- name: metadata