From b1cf8e126dab5d4ff6371866d0d143648b950519 Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Tue, 24 Mar 2020 22:50:54 +0100 Subject: [PATCH] feat(map.jinja): split `osfingermap.yaml` under `parameters/osfinger/` --- libvirt/osfingermap.yaml | 22 ------------------- .../parameters/osfinger/CentOS Linux-7.yaml | 15 +++++++++++++ libvirt/parameters/osfinger/Ubuntu-16.04.yaml | 15 +++++++++++++ 3 files changed, 30 insertions(+), 22 deletions(-) delete mode 100644 libvirt/osfingermap.yaml create mode 100644 libvirt/parameters/osfinger/CentOS Linux-7.yaml create mode 100644 libvirt/parameters/osfinger/Ubuntu-16.04.yaml diff --git a/libvirt/osfingermap.yaml b/libvirt/osfingermap.yaml deleted file mode 100644 index 12bf431..0000000 --- a/libvirt/osfingermap.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=yaml -# -# Setup variables using grains['osfinger'] based logic. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `os_family.yaml` + `osmap.yaml`. -# Only add an `osfinger` which is/will be supported by the formula -# -# If you do not need to provide defaults via the `os_finger` grain, -# you will need to provide at least an empty dict in this file, e.g. -# osfingermap: {} ---- -## os: Ubuntu -# Xenial -Ubuntu-16.04: - libvirt_pkg: libvirt-bin - libvirt_service: libvirt-bin - -## os: CentOS -CentOS Linux-7: - python2_pkg: libvirt-python - python3_pkg: ~ diff --git a/libvirt/parameters/osfinger/CentOS Linux-7.yaml b/libvirt/parameters/osfinger/CentOS Linux-7.yaml new file mode 100644 index 0000000..89d508d --- /dev/null +++ b/libvirt/parameters/osfinger/CentOS Linux-7.yaml @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +# +# Setup variables specific to salt['config.get']('osfinger') == CentOS Linux-7. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. +# +# If you do not need to provide defaults via the `osfinger` config, +# you can remove this file or provide at least an empty dict, e.g. +# values: {} +--- +values: + python2_pkg: libvirt-python + python3_pkg: ~ +... diff --git a/libvirt/parameters/osfinger/Ubuntu-16.04.yaml b/libvirt/parameters/osfinger/Ubuntu-16.04.yaml new file mode 100644 index 0000000..0ea5750 --- /dev/null +++ b/libvirt/parameters/osfinger/Ubuntu-16.04.yaml @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +# +# Setup variables specific to salt['config.get']('osfinger') == Ubuntu-16.04. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. +# +# If you do not need to provide defaults via the `osfinger` config, +# you can remove this file or provide at least an empty dict, e.g. +# values: {} +--- +values: + libvirt_pkg: libvirt-bin + libvirt_service: libvirt-bin +...