Merge "Remove Oneiric conditional logic"

2014-03-24 14:54:47 +00:00 · 2014-03-24 14:54:47 +00:00 · 59389c6ace
commit 59389c6ace
parent 3a6674663c 4f9d766c8a
1 changed files with 2 additions and 10 deletions
--- a/modules/openstack_project/manifests/base.pp
+++ b/modules/openstack_project/manifests/base.pp
@ -19,16 +19,8 @@ class openstack_project::base(
    ensure => absent,
  }

-  if ($::lsbdistcodename == 'oneiric') {
-    apt::ppa { 'ppa:git-core/ppa': }
-    package { 'git':
-      ensure  => latest,
-      require => Apt::Ppa['ppa:git-core/ppa'],
-    }
-  } else {
-    package { 'git':
-      ensure => present,
-    }
+  package { 'git':
+    ensure => present,
  }

  if ($::operatingsystem == 'Fedora') {