Merge branch 'development' into testing

clustervision · Aug 11, 2016 · 02f452e · 02f452e
2 parents e99eab6 + fa51558
commit 02f452e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/configuration/controller.cfg b/configuration/controller.cfg
@@ -46,6 +46,7 @@ POSTLIST=( \
             firewalld \
             chrony \
             environment-modules \
+            applications \
             rdma-centos \
             nfs-server \
             openldap \
@@ -54,7 +55,9 @@ POSTLIST=( \
             mariadb \
             slurm-pre \
             slurm \
-            applications \
+            luna \
+            zabbix \
+            services-cleanup \
          )
 
 

diff --git a/configuration/staging.cfg b/configuration/staging.cfg