diff --git a/AUTHORS.md b/AUTHORS.md index 91221db..910d6e2 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|77 -@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|36 +@myii|[@myii](https://github.com/myii)|78 +@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|37 @aboe76|[@aboe76](https://github.com/aboe76)|18 @gravyboat|[@gravyboat](https://github.com/gravyboat)|6 @whiteinge|[@whiteinge](https://github.com/whiteinge)|4 @@ -28,4 +28,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-07-15. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-07-24. diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c676dc..98b185e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.8.1](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.8.0...v3.8.1) (2020-07-24) + + +### Bug Fixes + +* **map:** `path_join` can't be used on windows ([c2b3465](https://github.com/saltstack-formulas/libvirt-formula/commit/c2b34655a9339ff1b453a47ab1ed7e43f91ece39)) + # [3.8.0](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.7.6...v3.8.0) (2020-07-15) diff --git a/FORMULA b/FORMULA index ce078b3..23e4b77 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: libvirt os: Debian, CentOS, openSUSE, Suse os_family: Debian, RedHat, Suse -version: 3.8.0 +version: 3.8.1 release: 1 minimum_version: 2018.3 summary: libvirt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 4c7d416..fc655b9 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,10 +15,10 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 77 + - 78 * - :raw-html-m2r:`@baby-gnu` - `@baby-gnu `_ - - 36 + - 37 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 18 @@ -80,4 +80,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-07-15. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-07-24. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 8633a27..5a6c944 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`3.8.1 `_ (2020-07-24) +--------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **map:** ``path_join`` can't be used on windows (\ `c2b3465 `_\ ) + `3.8.0 `_ (2020-07-15) --------------------------------------------------------------------------------------------------------- diff --git a/libvirt/map.jinja b/libvirt/map.jinja index 6ef4883..285c83d 100644 --- a/libvirt/map.jinja +++ b/libvirt/map.jinja @@ -6,10 +6,10 @@ {%- from tplroot ~ "/libsaltcli.jinja" import cli with context %} {#- Where to lookup parameters source files #} -{%- set map_sources_dir = tplroot | path_join("parameters") %} +{%- set map_sources_dir = tplroot ~ "/parameters" %} {#- Load defaults first to allow per formula default map.jinja configuration #} -{%- set _defaults_filename = map_sources_dir | path_join("defaults.yaml") %} +{%- set _defaults_filename = map_sources_dir ~ "/defaults.yaml" %} {%- do salt["log.debug"]( "map.jinja: initialise parameters from " ~ _defaults_filename @@ -144,9 +144,10 @@ {%- endif %} {%- for map_value in map_values %} -{%- set yamlfile = map_sources_dir | path_join( +{%- set yamlfile = "{}/{}/{}.yaml".format( + map_sources_dir, map_source, - map_value ~ ".yaml", + map_value, ) %} {%- do salt["log.debug"]("map.jinja: load parameters from file " ~ yamlfile) %} {%- load_yaml as loaded_values %}