From ce4060642668317950774c43debf3fc2bb2e2b2d Mon Sep 17 00:00:00 2001
From: "Wile E. Coyote" <rhizomatica@rhizomatica.org>
Date: Mon, 12 Feb 2018 20:16:42 +0000
Subject: [PATCH] Fix up packages

---
 modules/rhizo_base/manifests/openbsc.pp  | 12 +++++-----
 modules/rhizo_base/manifests/packages.pp | 28 ++++++++++++------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp
index fc8c58b..bee6e46 100644
--- a/modules/rhizo_base/manifests/openbsc.pp
+++ b/modules/rhizo_base/manifests/openbsc.pp
@@ -25,23 +25,23 @@ class rhizo_base::openbsc {
   $bts3_ip_address = $rhizo_base::bts3_ip_address
   $smsc_password   = $rhizo_base::smsc_password
 
-  package { [ 'libosmoabis5', 'libosmocore8',
-              'libosmoctrl0', 'libosmogsm7',
-              'libosmovty3' ]:
+  package { [ 'libsmpp0', ]:
       ensure   => latest,
       require  => Class['rhizo_base::apt'],
       notify   => [ Exec['notify-nitb'] ],
     }
 
   package {  [ 'osmocom-nitb' ]:
-      ensure   => '0.15.1-0rhizo5',
+      ensure   => 'latest',
       require  => Class['rhizo_base::apt'],
       notify   => [ Exec['hlr_pragma_wal'],
                     Exec['notify-nitb'] ],
     }
 
-  package { [ 'libosmoabis3', 'libosmocore4',
-              'libosmogsm6', 'libosmovty0',
+  package { [ 'libosmoabis3',
+              'libosmoctrl0',
+              'libosmogsm6', 'libosmogsm7',
+              'libosmovty3',
               'libgtp', 'libgtp0',
               'libgtp0-dev', 'openggsn',
               'libosmo-abis', 'libosmo-abis-dbg',
diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp
index d16f86f..4542fdb 100644
--- a/modules/rhizo_base/manifests/packages.pp
+++ b/modules/rhizo_base/manifests/packages.pp
@@ -17,9 +17,15 @@ class rhizo_base::packages {
 
 class rhizo_base::packages::common {
 
+  package { [ 'python-python-smpplib' ]:
+      ensure => purged
+    }
+
   package { ['mosh', 'git', 'openvpn', 'lm-sensors', 'runit', 'sqlite3',
             'libffi-dev', 'apcupsd', 'expect', 'gawk', 'swig', 'g++',
-            'python-python-smpplib', 'libcdk5' ]:
+            'libcdk5' , 'sngrep', 'rrdtool', 'dnsmasq',
+            'python-unidecode', 'python-dateutil', 'python-yaml', 'python-formencode',
+            'python-smpplib', 'python-psycopg2', 'python-pysqlite2' ]:
       ensure  => installed,
       require => Class['rhizo_base::apt'],
     }
@@ -32,13 +38,10 @@ class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common {
       ensure  => '3.8.1-1puppetlabs1',
     }
 
-#Apache2 + PHP + Python
-  package { ['apache2','libapache2-mod-php5.6',
-  'rrdtool', 'python-twisted-web', 'python-psycopg2',
-  'python-pysqlite2', 'php5.6', 'php5.6-pgsql',
-  'php5.6-curl', 'php5.6-cli', 'php5.6-gd', 'python-corepost', 'php5.6-xml',
-  'python-yaml', 'python-formencode', 'python-unidecode',
-  'python-dateutil']:
+#Apache2 + PHP
+  package { ['apache2','libapache2-mod-php5.6', 'php5.6', 'php5.6-pgsql',
+  'php5.6-curl', 'php5.6-cli', 'php5.6-gd', 'php5.6-xml',
+  'python-corepost', 'python-twisted-web' ]:
       ensure  => installed,
       require => Class['rhizo_base::apt'],
     }
@@ -53,12 +56,9 @@ class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common {
 
 class rhizo_base::packages::debian inherits rhizo_base::packages::common {
 
-  package { ['apache2','libapache2-mod-php5',
-  'rrdtool', 'python-psycopg2',
-  'python-pysqlite2', 'php5', 'php5-pgsql',
-  'php5-curl', 'php5-cli', 'php5-gd',
-  'python-yaml', 'python-formencode', 'python-unidecode',
-  'python-dateutil', 'sudo', 'apt-transport-https']:
+  package { ['apache2','libapache2-mod-php5', 'php5', 'php5-pgsql',
+  'php5-curl', 'php5-cli', 'php5-gd', 
+  'sudo', 'apt-transport-https']:
       ensure  => installed,
       require => Class['rhizo_base::apt'],
     }