Merge "Pin facter on centos boxes"

install_puppet.sh

@@ -55,7 +55,7 @@ baseurl=http://yum.puppetlabs.com/el/6/products/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppetlabs
 enabled=1
 gpgcheck=1
-exclude=puppet-2.8* puppet-2.9* puppet-3*
+exclude=puppet-2.8* puppet-2.9* puppet-3* facter-2*
 EOF
 
     yum update -y

modules/openstack_project/files/centos-puppetlabs.repo

@@ -0,0 +1,7 @@
+[puppetlabs-products]
+name=Puppet Labs Products El 6 - $basearch
+baseurl=http://yum.puppetlabs.com/el/6/products/$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppetlabs
+enabled=1
+gpgcheck=1
+exclude=puppet-2.8* puppet-2.9* puppet-3* facter-2*

modules/openstack_project/manifests/base.pp

@@ -122,6 +122,17 @@ class openstack_project::base(
 
   }
 
+  if ($::operatingsystem == 'CentOS') {
+    file { '/etc/yum.repos.d/puppetlabs.repo':
+      ensure  => present,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0444',
+      source  => 'puppet:///modules/openstack_project/centos-puppetlabs.repo',
+      replace => true,
+    }
+  }
+
   file { '/etc/puppet/puppet.conf':
     ensure  => present,
     owner   => 'root',