[icinga-checkins] icinga.org: icinga-vagrant/master: icinga2x: EPEL renamed python-pip to python2-pip, fixed Graphite install

git at icinga.org git at icinga.org
Mon Dec 19 00:12:36 CET 2016


Module: icinga-vagrant
Branch: master
Commit: 92741e9ed53552214e818fbab1d4d7cd845df80a
URL:    https://git.icinga.org/?p=icinga-vagrant.git;a=commit;h=92741e9ed53552214e818fbab1d4d7cd845df80a

Author: Michael Friedrich <michael.friedrich at icinga.com>
Date:   Mon Dec 19 00:11:51 2016 +0100

icinga2x: EPEL renamed python-pip to python2-pip, fixed Graphite install

---

 icinga2x/manifests/default.pp |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/icinga2x/manifests/default.pp b/icinga2x/manifests/default.pp
index 7546840..e88e3bd 100644
--- a/icinga2x/manifests/default.pp
+++ b/icinga2x/manifests/default.pp
@@ -507,6 +507,10 @@ apache::vhost { 'graphite.localdomain':
   }
   ]
 }->
+package { [ 'python2-pip', 'python-devel', 'gcc' ]:
+  ensure => 'installed', #workaround for EPEL rename of python-pip to python2-pip, http://smoogespace.blogspot.de/2016/12/why-are-epel-python-packages-getting.html
+  require => Class['epel']
+}->
 class { 'graphite':
   gr_apache_24            => true,
   gr_web_server           => 'none',
@@ -514,6 +518,8 @@ class { 'graphite':
   gr_web_group            => 'apache',
   gr_disable_webapp_cache => true,
   secret_key => 'ICINGA2ROCKS',
+  gr_pip_install => true,
+  gr_manage_python_packages => false, #workaround for EPEL rename of python-pip to python2-pip
   gr_graphite_ver => '0.9.14',
   gr_carbon_ver => '0.9.14',
   gr_whisper_ver => '0.9.14',



More information about the icinga-checkins mailing list