From 2d24ebf6f3ef31ada94fefc95223ad99ee1a6068 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Aug 30 2017 11:20:35 +0000
Subject: Merge branch 'tampakrap_htop_mtr' into 'production'


install mtr and traceroute only on leap and sle12 machines (also add htop)

See merge request !51
---

diff --git a/pillar/common.sls b/pillar/common.sls
index 658ac82..4bf1a1e 100644
--- a/pillar/common.sls
+++ b/pillar/common.sls
@@ -131,13 +131,11 @@ zypper:
     less: {}
     lsof: {}
     man: {}
-    mtr: {}
     openssh-helpers: {}
     screen: {}
     sssd-ldap: {}
     susepaste: {}
     tcpdump: {}
-    traceroute: {}
     vim: {}
     vim-data: {}
     wget: {}
diff --git a/pillar/osmajorrelease/12_or_42.sls b/pillar/osmajorrelease/12_or_42.sls
index 41e1cf5..d0527dd 100644
--- a/pillar/osmajorrelease/12_or_42.sls
+++ b/pillar/osmajorrelease/12_or_42.sls
@@ -2,4 +2,7 @@ zypper:
   packages:
     aaa_base-extras: {}
     ca-certificates-mozilla: {}
+    htop: {}
+    mtr: {}
     tmux: {}
+    traceroute: {}