diff --git a/install_puppet.sh b/install_puppet.sh index 203e952a47..d1f070d772 100755 --- a/install_puppet.sh +++ b/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 diff --git a/modules/openstack_project/files/centos-puppetlabs.repo b/modules/openstack_project/files/centos-puppetlabs.repo new file mode 100644 index 0000000000..3637bc3e54 --- /dev/null +++ b/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* diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp index 9185eccf0b..cf0f97a7ba 100644 --- a/modules/openstack_project/manifests/base.pp +++ b/modules/openstack_project/manifests/base.pp @@ -83,6 +83,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',