add mysql57 repo kram

diff --git a/customer/lapp-shop/dev01-www-lapp-de.pixelpark.net.yaml b/customer/lapp-shop/dev01-www-lapp-de.pixelpark.net.yaml
index 8e2df1ee6d96ee262e6d83554f1398f54d6b16f0..67285461a396e6131ac1a324dfe705aadce465de 100644 (file)
--- a/customer/lapp-shop/dev01-www-lapp-de.pixelpark.net.yaml
+++ b/customer/lapp-shop/dev01-www-lapp-de.pixelpark.net.yaml
@@ -7,19 +7,7 @@ infra::additional_classes:
 
 java::package: java-1.8.0-oraclejdk
 
-infra::additional_files:
-  mysql57-community_repo:
-    path: '/etc/yum.repos.d/mysql57-community.repo'
-    owner: 'root'
-    group: 'root'
-    mode: '0644'
-    content: |
-      [mysql57-community]
-      name=MySQL 5.7 Community Server
-      baseurl=http://repo.mysql.com/yum/mysql-5.7-community/el/7/$basearch/
-      enabled=1
-      gpgcheck=1
-      gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
+repo::ol7_mysql57: true
 
 accounts::users:
   hybris:

diff --git a/modules.yaml b/modules.yaml
index d89ad45e9e6a3090e0c2c99c89b5bc212054f542..459ac76ccc11877af85f5a92b199fa9e695eb311 100644 (file)
--- a/modules.yaml
+++ b/modules.yaml
@@ -183,8 +183,9 @@ repo::redhat::oel7::ol7_u1_base_baseurl: 'https://repo.pixelpark.com/Linux/yum/O
 repo::redhat::oel7::ol7_uekr3_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/UEKR3/$basearch/'
 repo::redhat::oel7::ol7_optional_latest_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/optional/latest/$basearch/'
 repo::redhat::oel7::ol7_addons_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/addons/$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::oel7::ol7_mysql56_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/MySQL56/community/$basearch/'
+repo::redhat::oel7::ol7_mysql57_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/MySQL57/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'

diff --git a/modules/repo.yaml b/modules/repo.yaml
index 9da4f384172e726a1c73bb1e9fbbee356869c3d0..25d6778a1baa00ccda484983bfa04997111aabb6 100644 (file)
--- a/modules/repo.yaml
+++ b/modules/repo.yaml
@@ -5,8 +5,9 @@ repo::redhat::oel7::ol7_u1_base_baseurl: 'https://repo.pixelpark.com/Linux/yum/O
 repo::redhat::oel7::ol7_uekr3_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/UEKR3/$basearch/'
 repo::redhat::oel7::ol7_optional_latest_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/optional/latest/$basearch/'
 repo::redhat::oel7::ol7_addons_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/addons/$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::oel7::ol7_mysql56_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/MySQL56/community/$basearch/'
+repo::redhat::oel7::ol7_mysql57_baseurl: 'https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/MySQL57/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/'