-
Notifications
You must be signed in to change notification settings - Fork 85
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/template override and files switch #19
Merged
aboe76
merged 8 commits into
saltstack-formulas:master
from
eole:feature/Template-Override-and-Files-Switch
Feb 8, 2019
Merged
Feature/template override and files switch #19
aboe76
merged 8 commits into
saltstack-formulas:master
from
eole:feature/Template-Override-and-Files-Switch
Feb 8, 2019
Commits on Feb 6, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 2dd659f - Browse repository at this point
Copy the full SHA 2dd659fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 784ce72 - Browse repository at this point
Copy the full SHA 784ce72View commit details
Commits on Feb 7, 2019
-
Cosmetics modification of TOFS pattern documentation
* TOFS_pattern.md: add myself as modifier. Trim trailing whitespaces. Separate titles from first paragraph.
Configuration menu - View commit details
-
Copy full SHA for 8bbab14 - Browse repository at this point
Copy the full SHA 8bbab14View commit details -
Make TOFS pattern example usable
The example could not be used as-is. This commit improve conformity to formula conventions. * TOFS_pattern.md: add missing commas “,” in “map.jinja” and extra one to ease the addition of new entries. Import “map.jinja” in “init.sls” and “conf.sls”. Declare descriptive state IDs. Use the “module.function” notation. Use the “name” parameter.
Configuration menu - View commit details
-
Copy full SHA for 6c17974 - Browse repository at this point
Copy the full SHA 6c17974View commit details -
Accept pillar separator in “files_switch” prefix
The prefix was used for 2 purposes: - define the pillar prefix where to lookup “:files_switch”. It supports the colon “:” separator to lookup in pillar subtree like “foo:bar” - define the path prefix where to look for “files/”, It did not support separator to lookup inside directory tree. This patch only replace any colon “:” with “/” when looking up “files/” directory, with the “foo:bar” prefix: - lookup “foo:bar:files_switch” pillar to get list of grains to match - lookup files under “salt://foo/bar/files/” * TOFS_pattern.md: document the new use of “prefix” supporting colon “:”. * template/macros.jinja: transform any colon “:” in “prefix” by slash “/” to lookup files.
Configuration menu - View commit details
-
Copy full SHA for e4e7067 - Browse repository at this point
Copy the full SHA e4e7067View commit details -
Configuration menu - View commit details
-
Copy full SHA for 24eaeb7 - Browse repository at this point
Copy the full SHA 24eaeb7View commit details -
Remove double slash in generated salt URL
When the files are “full path” with leading slash “/”, the generated URL contain a double slash because of the join. * template/macros.jinja: remove leading slash before joining parts. * TOFS_pattern.md: mirror changes of “macros.jinja”.
Configuration menu - View commit details
-
Copy full SHA for 8bd2157 - Browse repository at this point
Copy the full SHA 8bd2157View commit details -
The “template” is kept during rendering. * TOFS_pattern.md: add “template” to rendered state. * template/macros.jinja: ditoo.
Configuration menu - View commit details
-
Copy full SHA for 312fcdb - Browse repository at this point
Copy the full SHA 312fcdbView commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.