Skip to content

Instantly share code, notes, and snippets.

@CyrilPeponnet
Created September 26, 2014 17:46
Show Gist options
  • Save CyrilPeponnet/51ec0e0ea4ced24f3ff7 to your computer and use it in GitHub Desktop.
Save CyrilPeponnet/51ec0e0ea4ced24f3ff7 to your computer and use it in GitHub Desktop.
centos7 yaml
diff --git a/data/hiera.yaml b/data/hiera.yaml
index 52b83b5..49a2c9f 100644
--- a/data/hiera.yaml
+++ b/data/hiera.yaml
@@ -2,6 +2,7 @@
---
:hierarchy:
- tree/%{::osfamily}/%{::operatingsystem}/%{::operatingsystemrelease}
+- tree/%{::osfamily}/%{::operatingsystem}/%{::operatingsystemmajrelease}
- tree/%{::osfamily}/%{::operatingsystem}
- tree/%{::osfamily}
- common
diff --git a/data/tree/RedHat/CentOS/7.0.yaml b/data/tree/RedHat/CentOS/7.0.yaml
deleted file mode 100644
index c7dc4f7..0000000
--- a/data/tree/RedHat/CentOS/7.0.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# gluster/data/tree/RedHat/Centos/7.0.yaml
----
-gluster::params::package_python_argparse: '' # doesn't exist
-gluster::params::misc_gluster_reload: '/usr/bin/systemctl reload glusterd'
-
-# vim: ts=8
diff --git a/data/tree/RedHat/CentOS/7.yaml b/data/tree/RedHat/CentOS/7.yaml
new file mode 100644
index 0000000..f41618e
--- /dev/null
+++ b/data/tree/RedHat/CentOS/7.yaml
@@ -0,0 +1,6 @@
+# gluster/data/tree/RedHat/Centos/7.yaml
+---
+gluster::params::package_python_argparse: '' # doesn't exist
+gluster::params::misc_gluster_reload: '/usr/bin/systemctl reload glusterd'
+
+# vim: ts=8
diff --git a/manifests/repo.pp b/manifests/repo.pp
index c91df7d..8fd07e6 100644
--- a/manifests/repo.pp
+++ b/manifests/repo.pp
@@ -91,7 +91,7 @@ define gluster::repo(
fail("Architecture: '${architecture}' not yet supported.")
}
- $base_arch = "${base_os}epel-${operatingsystemrelease}/"
+ $base_arch = "${base_os}epel-${operatingsystemmajrelease}/"
yumrepo { "${name}":
baseurl => "${base_arch}${arch}/",
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment