Merge "Don't exclude python-setuptools"

2016-02-02 00:55:46 +00:00
parent 730c88eb8a c3139a1dad
commit 6fd0c50706
3 changed files with 17 additions and 35 deletions
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -420,14 +420,6 @@ class openstack_project::template (
      replace => true,
    }

-    file { '/etc/yum.conf':
-      ensure  => present,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0444',
-      source  => 'puppet:///modules/openstack_project/yum.conf',
-      replace => true,
-    }
  }

  $puppet_version = $pin_puppet