Correct Repos for new puppet 5

diff --git a/modules.yaml b/modules.yaml
index f8d4b53f60b049b1533843c5d9e6f79930e8c8df..a42bad1c76036c79e25cc064057c4ff1721bfe1f 100644 (file)
--- a/modules.yaml
+++ b/modules.yaml
@@ -186,20 +186,13 @@ repo::redhat::oel7::ol7_addons_baseurl: 'https://repo.pixelpark.com/Linux/yum/Or
 repo::redhat::oel7::ol7_mysql56_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/MySQL56/community/$basearch/'
 repo::redhat::oel7::ol7_mysql55_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/MySQL55/community/$basearch/'
 
-# Deprecated - if Commit https://git.pixelpark.com/puppet/repo/commit/86e6183e8f208fbf3cae88e5cf6793d92caf0a67 is in production, we can delete this three lines
-repo::redhat::oel7::ol7_UEKR3_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/UEKR3/$basearch/'
-repo::redhat::oel7::ol7_MySQL56_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/MySQL56/community/$basearch/'
-repo::redhat::oel7::ol7_MySQL55_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/MySQL55/community/$basearch/'
-
 repo::redhat::remi::remi_baseurl: 'https://repo.pixelpark.com/Linux/yum/remi/%{operatingsystemmajrelease}/remi/$basearch'
 repo::redhat::remi::remi_php55_baseurl: 'https://repo.pixelpark.com/Linux/yum/remi/%{operatingsystemmajrelease}/php55/$basearch'
 repo::redhat::remi::remi_php56_baseurl: 'https://repo.pixelpark.com/Linux/yum/remi/%{operatingsystemmajrelease}/php56/$basearch'
 repo::redhat::remi::remi_php70_baseurl: 'https://repo.pixelpark.com/Linux/yum/remi/%{operatingsystemmajrelease}/php70/$basearch'
 repo::redhat::remi::remi_safe_baseurl: 'https://repo.pixelpark.com/Linux/yum/remi/%{operatingsystemmajrelease}/safe/$basearch'
 
-repo::redhat::puppetlabs::puppetlabs_products_baseurl: 'https://repo.pixelpark.com/Linux/yum/puppetlabs/el/%{operatingsystemmajrelease}/products/$basearch'
-repo::redhat::puppetlabs::puppetlabs_deps_baseurl: 'https://repo.pixelpark.com/Linux/yum/puppetlabs/el/%{operatingsystemmajrelease}/dependencies/$basearch'
-repo::redhat::puppetlabs::puppetlabs_devel_baseurl: 'https://repo.pixelpark.com/Linux/yum/puppetlabs/el/%{operatingsystemmajrelease}/devel/$basearch'
+repo::redhat::puppetlabs::baseurl: 'https://repo.pixelpark.com/Linux/yum/puppetlabs/puppet5/el/%{operatingsystemmajrelease}/$basearch'
 
 repo::redhat::centos::base_baseurl: 'https://repo.pixelpark.com/Linux/yum/centos/$releasever/os/$basearch/'
 repo::redhat::centos::updates_baseurl: 'https://repo.pixelpark.com/Linux/yum/centos/$releasever/updates/$basearch/'