Update naming of os-independent-puppet data directory.

This makes more logical sense, particularly if using data in modules for more than one purpose.
purpleidea · b9709099a6402b19b403200221b1537e23e38dd1 · purpleidea committed Dec 23, 2014 · Dec 23, 2014 · b970909
1 parent c229108
commit b9709099a6402b19b403200221b1537e23e38dd1
diff --git a/data/hiera.yaml b/data/hiera.yaml
@@ -3,9 +3,9 @@
 :hierarchy:
 - versions/%{::gluster_major_version}/%{::gluster_version}
 - versions/%{::gluster_major_version}
-- tree/%{::osfamily}/%{::operatingsystem}/%{::operatingsystemrelease}
-- tree/%{::osfamily}/%{::operatingsystem}
-- tree/%{::osfamily}
+- params/%{::osfamily}/%{::operatingsystem}/%{::operatingsystemrelease}
+- params/%{::osfamily}/%{::operatingsystem}
+- params/%{::osfamily}
 - common
 
 # vim: ts=8
diff --git a/data/tree/Debian.yaml → data/params/Debian.yaml b/data/tree/Debian.yaml → data/params/Debian.yaml
@@ -1,4 +1,4 @@
-# gluster/data/tree/Debian.yaml
+# gluster/data/params/Debian.yaml
 ---
 gluster::params::package_glusterfs: 'glusterfs-client'
 gluster::params::package_glusterfs_api: ''      # doesn't exist
diff --git a/data/params/Debian/Debian.yaml b/data/params/Debian/Debian.yaml
@@ -0,0 +1,4 @@
+# gluster/data/params/Debian/Debian.yaml
+---
+
+# vim: ts=8
diff --git a/data/params/Debian/Debian/7.4.yaml b/data/params/Debian/Debian/7.4.yaml
@@ -0,0 +1,4 @@
+# gluster/data/params/Debian/Debian/7.4.yaml
+---
+
+# vim: ts=8
diff --git a/data/params/Debian/Ubuntu.yaml b/data/params/Debian/Ubuntu.yaml
@@ -0,0 +1,4 @@
+# gluster/data/params/Debian/Ubuntu.yaml
+---
+
+# vim: ts=8
diff --git a/data/params/Debian/Ubuntu/12.04.yaml b/data/params/Debian/Ubuntu/12.04.yaml
@@ -0,0 +1,4 @@
+# gluster/data/params/Debian/Ubuntu/12.04.yaml
+---
+
+# vim: ts=8
diff --git a/data/params/Gentoo.yaml b/data/params/Gentoo.yaml
@@ -0,0 +1,4 @@
+# gluster/data/params/Gentoo.yaml
+---
+
+# vim: ts=8
diff --git a/data/tree/RedHat.yaml → data/params/RedHat.yaml b/data/tree/RedHat.yaml → data/params/RedHat.yaml
@@ -1,4 +1,4 @@
-# gluster/data/tree/RedHat.yaml
+# gluster/data/params/RedHat.yaml
 ---
 gluster::params::misc_gluster_repo: 'https://download.gluster.org/pub/gluster/glusterfs/'
 
diff --git a/data/params/RedHat/CentOS.yaml b/data/params/RedHat/CentOS.yaml
@@ -0,0 +1,4 @@
+# gluster/data/params/RedHat/CentOS.yaml
+---
+
+# vim: ts=8
diff --git a/data/params/RedHat/CentOS/6.5.yaml b/data/params/RedHat/CentOS/6.5.yaml
@@ -0,0 +1,4 @@
+# gluster/data/params/RedHat/CentOS/6.5.yaml
+---
+
+# vim: ts=8
diff --git a/data/tree/RedHat/CentOS/7.0.1406.yaml → data/params/RedHat/CentOS/7.0.1406.yaml b/data/tree/RedHat/CentOS/7.0.1406.yaml → data/params/RedHat/CentOS/7.0.1406.yaml
@@ -1,4 +1,4 @@
-# gluster/data/tree/RedHat/CentOS/7.0.1406.yaml
+# gluster/data/params/RedHat/CentOS/7.0.1406.yaml
 ---
 gluster::params::package_python_argparse: ''	# doesn't exist
 gluster::params::program_modprobe: '/usr/sbin/modprobe'
diff --git a/data/tree/RedHat/Fedora.yaml → data/params/RedHat/Fedora.yaml b/data/tree/RedHat/Fedora.yaml → data/params/RedHat/Fedora.yaml
@@ -1,4 +1,4 @@
-# gluster/data/tree/RedHat/Fedora.yaml
+# gluster/data/params/RedHat/Fedora.yaml
 ---
 gluster::params::package_python_argparse: ''	# doesn't exist
 gluster::params::program_modprobe: '/usr/sbin/modprobe'
diff --git a/data/params/RedHat/Fedora/20.yaml b/data/params/RedHat/Fedora/20.yaml
@@ -0,0 +1,4 @@
+# gluster/data/params/RedHat/Fedora/20.yaml
+---
+
+# vim: ts=8
diff --git a/data/params/RedHat/RedHat.yaml b/data/params/RedHat/RedHat.yaml
@@ -0,0 +1,4 @@
+# gluster/data/params/RedHat/RedHat.yaml
+---
+
+# vim: ts=8
diff --git a/data/params/RedHat/RedHat/6.5.yaml b/data/params/RedHat/RedHat/6.5.yaml
@@ -0,0 +1,4 @@
+# gluster/data/params/RedHat/RedHat/6.5.yaml
+---
+
+# vim: ts=8
diff --git a/data/tree/RedHat/RedHat/7.0.yaml → data/params/RedHat/RedHat/7.0.yaml b/data/tree/RedHat/RedHat/7.0.yaml → data/params/RedHat/RedHat/7.0.yaml
@@ -1,4 +1,4 @@
-# gluster/data/tree/RedHat/RedHat/7.0.yaml
+# gluster/data/params/RedHat/RedHat/7.0.yaml
 ---
 gluster::params::package_python_argparse: ''	# doesn't exist
 gluster::params::misc_gluster_reload: '/usr/bin/systemctl reload glusterd'
diff --git a/data/tree/Debian/Debian.yaml b/data/tree/Debian/Debian.yaml
@@ -1,4 +0,0 @@
-# gluster/data/tree/Debian/Debian.yaml
----
-
-# vim: ts=8
diff --git a/data/tree/Debian/Debian/7.4.yaml b/data/tree/Debian/Debian/7.4.yaml
@@ -1,4 +0,0 @@
-# gluster/data/tree/Debian/Debian/7.4.yaml
----
-
-# vim: ts=8
diff --git a/data/tree/Debian/Ubuntu.yaml b/data/tree/Debian/Ubuntu.yaml
@@ -1,4 +0,0 @@
-# gluster/data/tree/Debian/Ubuntu.yaml
----
-
-# vim: ts=8
diff --git a/data/tree/Debian/Ubuntu/12.04.yaml b/data/tree/Debian/Ubuntu/12.04.yaml
@@ -1,4 +0,0 @@
-# gluster/data/tree/Debian/Ubuntu/12.04.yaml
----
-
-# vim: ts=8
diff --git a/data/tree/Gentoo.yaml b/data/tree/Gentoo.yaml
@@ -1,4 +0,0 @@
-# gluster/data/tree/Gentoo.yaml
----
-
-# vim: ts=8
diff --git a/data/tree/RedHat/CentOS.yaml b/data/tree/RedHat/CentOS.yaml
@@ -1,4 +0,0 @@
-# gluster/data/tree/RedHat/CentOS.yaml
----
-
-# vim: ts=8
diff --git a/data/tree/RedHat/CentOS/6.5.yaml b/data/tree/RedHat/CentOS/6.5.yaml
@@ -1,4 +0,0 @@
-# gluster/data/tree/RedHat/CentOS/6.5.yaml
----
-
-# vim: ts=8
diff --git a/data/tree/RedHat/Fedora/20.yaml b/data/tree/RedHat/Fedora/20.yaml
@@ -1,4 +0,0 @@
-# gluster/data/tree/RedHat/Fedora/20.yaml
----
-
-# vim: ts=8
diff --git a/data/tree/RedHat/RedHat.yaml b/data/tree/RedHat/RedHat.yaml
@@ -1,4 +0,0 @@
-# gluster/data/tree/RedHat/RedHat.yaml
----
-
-# vim: ts=8
diff --git a/data/tree/RedHat/RedHat/6.5.yaml b/data/tree/RedHat/RedHat/6.5.yaml
@@ -1,4 +0,0 @@
-# gluster/data/tree/RedHat/RedHat/6.5.yaml
----
-
-# vim: ts=8