Merge "Revert ppa glasterfs and pin to 3.10version"
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index a1df125..624e553 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -106,8 +106,8 @@
description: "YAML with overrides for Salt deployment"
SALT_VERSION:
type: text
- default: ""
- description: "Version of Salt which is going to be installed i.e. 'stable 2016.3' or 'stable 2017.7' etc."
+ default: "stable 2017.7"
+ description: "Version of Salt which is going to be installed i.e. 'stable 2016.3' or 'stable 2017.7' etc. Warning: This value doesn't override salt_version parameter set in the pillar."
BOOTSTRAP_EXTRA_REPO_PARAMS:
type: string
default: ""
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index ac839f8..33c60d9 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -1,5 +1,6 @@
classes:
- system.salt.master.single
+- system.salt.master.formula.pkg.auditd
- system.salt.master.formula.pkg.ccp
- system.salt.master.formula.pkg.foundation
- system.salt.master.formula.pkg.kubernetes
@@ -9,4 +10,4 @@
- system.salt.master.formula.pkg.stacklight
- system.salt.master.formula.pkg.monitoring
- system.salt.master.formula.pkg.helm
-- system.salt.master.formula.pkg.ceph
\ No newline at end of file
+- system.salt.master.formula.pkg.ceph