From b9709099a6402b19b403200221b1537e23e38dd1 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Tue, 23 Dec 2014 11:41:59 -0500 Subject: [PATCH] Update naming of os-independent-puppet data directory. This makes more logical sense, particularly if using data in modules for more than one purpose. --- data/hiera.yaml | 6 +++--- data/{tree => params}/Debian.yaml | 2 +- data/params/Debian/Debian.yaml | 4 ++++ data/params/Debian/Debian/7.4.yaml | 4 ++++ data/params/Debian/Ubuntu.yaml | 4 ++++ data/params/Debian/Ubuntu/12.04.yaml | 4 ++++ data/params/Gentoo.yaml | 4 ++++ data/{tree => params}/RedHat.yaml | 2 +- data/params/RedHat/CentOS.yaml | 4 ++++ data/params/RedHat/CentOS/6.5.yaml | 4 ++++ data/{tree => params}/RedHat/CentOS/7.0.1406.yaml | 2 +- data/{tree => params}/RedHat/Fedora.yaml | 2 +- data/params/RedHat/Fedora/20.yaml | 4 ++++ data/params/RedHat/RedHat.yaml | 4 ++++ data/params/RedHat/RedHat/6.5.yaml | 4 ++++ data/{tree => params}/RedHat/RedHat/7.0.yaml | 2 +- data/tree/Debian/Debian.yaml | 4 ---- data/tree/Debian/Debian/7.4.yaml | 4 ---- data/tree/Debian/Ubuntu.yaml | 4 ---- data/tree/Debian/Ubuntu/12.04.yaml | 4 ---- data/tree/Gentoo.yaml | 4 ---- data/tree/RedHat/CentOS.yaml | 4 ---- data/tree/RedHat/CentOS/6.5.yaml | 4 ---- data/tree/RedHat/Fedora/20.yaml | 4 ---- data/tree/RedHat/RedHat.yaml | 4 ---- data/tree/RedHat/RedHat/6.5.yaml | 4 ---- 26 files changed, 48 insertions(+), 48 deletions(-) rename data/{tree => params}/Debian.yaml (92%) create mode 100644 data/params/Debian/Debian.yaml create mode 100644 data/params/Debian/Debian/7.4.yaml create mode 100644 data/params/Debian/Ubuntu.yaml create mode 100644 data/params/Debian/Ubuntu/12.04.yaml create mode 100644 data/params/Gentoo.yaml rename data/{tree => params}/RedHat.yaml (75%) create mode 100644 data/params/RedHat/CentOS.yaml create mode 100644 data/params/RedHat/CentOS/6.5.yaml rename data/{tree => params}/RedHat/CentOS/7.0.1406.yaml (95%) rename data/{tree => params}/RedHat/Fedora.yaml (95%) create mode 100644 data/params/RedHat/Fedora/20.yaml create mode 100644 data/params/RedHat/RedHat.yaml create mode 100644 data/params/RedHat/RedHat/6.5.yaml rename data/{tree => params}/RedHat/RedHat/7.0.yaml (77%) delete mode 100644 data/tree/Debian/Debian.yaml delete mode 100644 data/tree/Debian/Debian/7.4.yaml delete mode 100644 data/tree/Debian/Ubuntu.yaml delete mode 100644 data/tree/Debian/Ubuntu/12.04.yaml delete mode 100644 data/tree/Gentoo.yaml delete mode 100644 data/tree/RedHat/CentOS.yaml delete mode 100644 data/tree/RedHat/CentOS/6.5.yaml delete mode 100644 data/tree/RedHat/Fedora/20.yaml delete mode 100644 data/tree/RedHat/RedHat.yaml delete mode 100644 data/tree/RedHat/RedHat/6.5.yaml diff --git a/data/hiera.yaml b/data/hiera.yaml index a7cbb93..3db9d0a 100644 --- 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 b/data/params/Debian.yaml similarity index 92% rename from data/tree/Debian.yaml rename to data/params/Debian.yaml index 098123c..16fc9cc 100644 --- a/data/tree/Debian.yaml +++ b/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 new file mode 100644 index 0000000..686ac95 --- /dev/null +++ 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 new file mode 100644 index 0000000..936a7cf --- /dev/null +++ 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 new file mode 100644 index 0000000..f0fbc83 --- /dev/null +++ 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 new file mode 100644 index 0000000..56e4749 --- /dev/null +++ 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 new file mode 100644 index 0000000..0ddea97 --- /dev/null +++ b/data/params/Gentoo.yaml @@ -0,0 +1,4 @@ +# gluster/data/params/Gentoo.yaml +--- + +# vim: ts=8 diff --git a/data/tree/RedHat.yaml b/data/params/RedHat.yaml similarity index 75% rename from data/tree/RedHat.yaml rename to data/params/RedHat.yaml index f320de4..84eb6b9 100644 --- a/data/tree/RedHat.yaml +++ b/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 new file mode 100644 index 0000000..d676ee3 --- /dev/null +++ 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 new file mode 100644 index 0000000..cae72fc --- /dev/null +++ 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 b/data/params/RedHat/CentOS/7.0.1406.yaml similarity index 95% rename from data/tree/RedHat/CentOS/7.0.1406.yaml rename to data/params/RedHat/CentOS/7.0.1406.yaml index 711addd..1b4cb3e 100644 --- a/data/tree/RedHat/CentOS/7.0.1406.yaml +++ b/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 b/data/params/RedHat/Fedora.yaml similarity index 95% rename from data/tree/RedHat/Fedora.yaml rename to data/params/RedHat/Fedora.yaml index 09a8789..74efc45 100644 --- a/data/tree/RedHat/Fedora.yaml +++ b/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 new file mode 100644 index 0000000..92b1c9b --- /dev/null +++ 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 new file mode 100644 index 0000000..8eacf05 --- /dev/null +++ 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 new file mode 100644 index 0000000..f363ef4 --- /dev/null +++ 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 b/data/params/RedHat/RedHat/7.0.yaml similarity index 77% rename from data/tree/RedHat/RedHat/7.0.yaml rename to data/params/RedHat/RedHat/7.0.yaml index e7f0ae7..d21be95 100644 --- a/data/tree/RedHat/RedHat/7.0.yaml +++ b/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 deleted file mode 100644 index b6d2ec3..0000000 --- a/data/tree/Debian/Debian.yaml +++ /dev/null @@ -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 deleted file mode 100644 index 94cbd63..0000000 --- a/data/tree/Debian/Debian/7.4.yaml +++ /dev/null @@ -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 deleted file mode 100644 index 4bfe9d7..0000000 --- a/data/tree/Debian/Ubuntu.yaml +++ /dev/null @@ -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 deleted file mode 100644 index e6c234a..0000000 --- a/data/tree/Debian/Ubuntu/12.04.yaml +++ /dev/null @@ -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 deleted file mode 100644 index b1d63e7..0000000 --- a/data/tree/Gentoo.yaml +++ /dev/null @@ -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 deleted file mode 100644 index d9ef302..0000000 --- a/data/tree/RedHat/CentOS.yaml +++ /dev/null @@ -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 deleted file mode 100644 index 06d5f62..0000000 --- a/data/tree/RedHat/CentOS/6.5.yaml +++ /dev/null @@ -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 deleted file mode 100644 index e132092..0000000 --- a/data/tree/RedHat/Fedora/20.yaml +++ /dev/null @@ -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 deleted file mode 100644 index 459369b..0000000 --- a/data/tree/RedHat/RedHat.yaml +++ /dev/null @@ -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 deleted file mode 100644 index a65e8f5..0000000 --- a/data/tree/RedHat/RedHat/6.5.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# gluster/data/tree/RedHat/RedHat/6.5.yaml ---- - -# vim: ts=8