Salt/sysctl-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/sysctl-formula.git synced 2025-07-19 20:18:22 +02:00
Code Issues Activity

chore(issues): remove issues templates to use org-level templates [skip ci]

Browse Source 
* Automated using https://github.com/myii/ssf-formula/pull/61
This commit is contained in:
Imran Iqbal 2019-10-10 15:24:56 +01:00
commit bd95accd31
15 changed files with 172 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@ -1,68 +0,0 @@
---
name: Bug report
about: Create a report to help us improve
title: '[BUG] '
labels: 'bug'
assignees: ''
---
<!--
Notes:
1. Only post _bug reports_ here.
2. Use the appropriate template for _feature requests_.
3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
-->
## Your setup
### Formula commit hash / release tag
<!-- Please specify the formula's commit hash and/or release tag that you are using. -->
### Versions reports (master & minion)
<!-- Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions. -->
### Pillar / config used
<!-- Provide links to the SLS files and/or relevant configs (be sure to remove sensitive info). -->
---
## Bug details
### Describe the bug
<!-- A clear and concise description of what the bug is. -->
### Steps to reproduce the bug
<!-- Include debug logs if possible and relevant, e.g. using `salt-minion -l debug`. -->
<!-- Alternatively, linking to Kitchen debug logs is useful, e.g. via. Travis CI. -->
<!-- Most useful is providing a failing InSpec test, which can be used to verify any proposed fix. -->
### Expected behaviour
<!-- A clear and concise description of what you expected to happen. -->
### Attempts to fix the bug
<!-- Please mention any attempts you have made to fix the bug and what the results were. -->
### Additional context
<!-- Add any other context about the problem here. -->
---
### Meta: How can this template be improved?
<!-- Feel free to suggest how this template can be improved. -->

42
.github/ISSUE_TEMPLATE/feature_request.md vendored
View File

@ -1,42 +0,0 @@
---
name: Feature request
about: Suggest an idea for this project
title: '[FEATURE] '
labels: 'enhancement'
assignees: ''
---
<!--
Notes:
1. Only post _feature requests_ here.
2. Use the appropriate template for _bug reports_.
3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
-->
### Is your feature request related to a problem?
<!-- A clear and concise description of what the problem is. -->
### Describe the solution you'd like
<!-- A clear and concise description of what you want to happen. -->
### Describe alternatives you've considered
<!-- Describe any alternative solutions or features you've considered. -->
### Additional context
<!-- Add any other context about the feature request here. -->
---
### Meta: How can this template be improved?
<!-- Feel free to suggest how this template can be improved. -->

10
.rubocop.yml Normal file
View File

@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
# General overrides used across formulas in the org
Metrics/LineLength:
# Increase from default of `80`
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
Max: 88
# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`

13
.salt-lint Normal file
View File

@ -0,0 +1,13 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
exclude_paths: []
skip_list:
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
- 205 # Use ".sls" as a Salt State file extension
# Skipping `207` and `208` because `210` is sufficient, at least for the time-being
# I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
- 207 # File modes should always be encapsulated in quotation marks
- 208 # File modes should always contain a leading zero
tags: []
verbosity: 1

117
.travis.yml
View File

@ -1,64 +1,43 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=yaml # vim: ft=yaml
--- ---
## Machine config
dist: bionic dist: bionic
stages:
- test
- lint
- name: release
if: branch = master AND type != pull_request
sudo: required sudo: required
cache: bundler
language: ruby
services: services:
- docker - docker
# Make sure the instances listed below match up with ## Language and cache config
# the `platforms` defined in `kitchen.yml` language: ruby
env: cache: bundler
matrix:
- INSTANCE: default-debian-10-develop-py3
# - INSTANCE: default-ubuntu-1804-develop-py3
# - INSTANCE: default-centos-7-develop-py3
# - INSTANCE: default-fedora-30-develop-py3
# - INSTANCE: default-opensuse-leap-15-develop-py3
# - INSTANCE: default-amazonlinux-2-develop-py2
# - INSTANCE: default-arch-base-latest-develop-py2
# - INSTANCE: default-debian-9-2019-2-py3
- INSTANCE: default-ubuntu-1804-2019-2-py3
# - INSTANCE: default-centos-7-2019-2-py3
# - INSTANCE: default-fedora-30-2019-2-py3
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
- INSTANCE: default-amazonlinux-2-2019-2-py2
- INSTANCE: default-arch-base-latest-2019-2-py2
# - INSTANCE: default-debian-9-2018-3-py2
# - INSTANCE: default-ubuntu-1604-2018-3-py2
# - INSTANCE: default-centos-7-2018-3-py2
- INSTANCE: default-fedora-29-2018-3-py2
- INSTANCE: default-opensuse-leap-15-2018-3-py2
# - INSTANCE: default-amazonlinux-2-2018-3-py2
# - INSTANCE: default-arch-base-latest-2018-3-py2
# - INSTANCE: default-debian-8-2017-7-py2
# - INSTANCE: default-ubuntu-1604-2017-7-py2
# - INSTANCE: default-centos-6-2017-7-py2
# - INSTANCE: default-fedora-29-2017-7-py2
# - INSTANCE: default-opensuse-leap-15-2017-7-py2
# - INSTANCE: default-amazonlinux-2-2017-7-py2
# - INSTANCE: default-arch-base-latest-2017-7-py2
## Script to run for the test stage
script: script:
- bin/kitchen verify ${INSTANCE} - bin/kitchen verify "${INSTANCE}"
## Stages and jobs matrix
stages:
- test
- name: release
if: branch = master AND type != pull_request
jobs: jobs:
allow_failures:
- env: Lint_rubocop
fast_finish: true
include: include:
# Define the `lint` stage (runs `yamllint` and `commitlint`) ## Define the test stage that runs the linters (and testing matrix, if applicable)
- stage: lint
language: node_js # Run all of the linters in a single job (except `rubocop`)
- language: node_js
node_js: lts/* node_js: lts/*
env: Lint
name: 'Lint: salt-lint, yamllint & commitlint'
before_install: skip before_install: skip
script: script:
# Install and run `salt-lint`
- pip install --user salt-lint
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
| xargs -I {} salt-lint {}
# Install and run `yamllint` # Install and run `yamllint`
# Need at least `v1.17.0` for the `yaml-files` setting # Need at least `v1.17.0` for the `yaml-files` setting
- pip install --user yamllint>=1.17.0 - pip install --user yamllint>=1.17.0
@ -67,10 +46,56 @@ jobs:
- npm install @commitlint/config-conventional -D - npm install @commitlint/config-conventional -D
- npm install @commitlint/travis-cli -D - npm install @commitlint/travis-cli -D
- commitlint-travis - commitlint-travis
# Define the release stage that runs `semantic-release` # Run the `rubocop` linter in a separate job that is allowed to fail
# Once these lint errors are fixed, this can be merged into a single job
- language: node_js
node_js: lts/*
env: Lint_rubocop
name: 'Lint: rubocop'
before_install: skip
script:
# Install and run `rubocop`
- gem install rubocop
- rubocop -d
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
- env: INSTANCE=default-debian-10-develop-py3
# - env: INSTANCE=default-ubuntu-1804-develop-py3
# - env: INSTANCE=default-centos-7-develop-py3
# - env: INSTANCE=default-fedora-30-develop-py3
# - env: INSTANCE=default-opensuse-leap-15-develop-py3
# - env: INSTANCE=default-amazonlinux-2-develop-py2
# - env: INSTANCE=default-arch-base-latest-develop-py2
# - env: INSTANCE=default-debian-9-2019-2-py3
- env: INSTANCE=default-ubuntu-1804-2019-2-py3
# - env: INSTANCE=default-centos-7-2019-2-py3
# - env: INSTANCE=default-fedora-30-2019-2-py3
# - env: INSTANCE=default-opensuse-leap-15-2019-2-py3
- env: INSTANCE=default-amazonlinux-2-2019-2-py2
- env: INSTANCE=default-arch-base-latest-2019-2-py2
# - env: INSTANCE=default-debian-9-2018-3-py2
# - env: INSTANCE=default-ubuntu-1604-2018-3-py2
# - env: INSTANCE=default-centos-7-2018-3-py2
- env: INSTANCE=default-fedora-29-2018-3-py2
- env: INSTANCE=default-opensuse-leap-15-2018-3-py2
# - env: INSTANCE=default-amazonlinux-2-2018-3-py2
# - env: INSTANCE=default-arch-base-latest-2018-3-py2
# - env: INSTANCE=default-debian-8-2017-7-py2
# - env: INSTANCE=default-ubuntu-1604-2017-7-py2
# - env: INSTANCE=default-centos-6-2017-7-py2
# - env: INSTANCE=default-fedora-29-2017-7-py2
# - env: INSTANCE=default-opensuse-leap-15-2017-7-py2
# - env: INSTANCE=default-amazonlinux-2-2017-7-py2
# - env: INSTANCE=default-arch-base-latest-2017-7-py2
## Define the release stage that runs `semantic-release`
- stage: release - stage: release
language: node_js language: node_js
node_js: lts/* node_js: lts/*
env: Release
name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
before_install: skip before_install: skip
script: script:
# Update `AUTHORS.md` # Update `AUTHORS.md`

6
AUTHORS.md
View File

@ -4,8 +4,10 @@ This list is sorted by the number of commits per contributor in _descending_ ord
Avatar|Contributor|Contributions Avatar|Contributor|Contributions
:-:|---|:-: :-:|---|:-:
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|14 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|17
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|15
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>|[@babilen5](https://github.com/babilen5)|7 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>|[@babilen5](https://github.com/babilen5)|7
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>|[@n-rodriguez](https://github.com/n-rodriguez)|3
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|2 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|2
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1705640?v=4' width='36' height='36' alt='@zajk'>|[@zajk](https://github.com/zajk)|2 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1705640?v=4' width='36' height='36' alt='@zajk'>|[@zajk](https://github.com/zajk)|2
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|2 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|2
@ -15,4 +17,4 @@ Avatar|Contributor|Contributions
--- ---
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-08-28. Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10.

20
CHANGELOG.md
View File

@ -1,5 +1,25 @@
# Changelog # Changelog
## [0.6.1](https://github.com/saltstack-formulas/sysctl-formula/compare/v0.6.0...v0.6.1) (2019-10-10)
### Bug Fixes
* **map.jinja:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/sysctl-formula/commit/6a08317))
* **package.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/sysctl-formula/commit/a8bbd25))
* **param.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/sysctl-formula/commit/50494dc))
### Continuous Integration
* **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/sysctl-formula/commit/519d39b))
* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/sysctl-formula/commit/10a70f0))
* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/sysctl-formula/commit/1f2f4ce))
* **platform:** add `arch-base-latest` ([](https://github.com/saltstack-formulas/sysctl-formula/commit/d9dfd4b))
* **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([](https://github.com/saltstack-formulas/sysctl-formula/commit/9fd2f1c))
* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/sysctl-formula/commit/9d202ba))
* use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([](https://github.com/saltstack-formulas/sysctl-formula/commit/c7e34a9))
# [0.6.0](https://github.com/saltstack-formulas/sysctl-formula/compare/v0.5.0...v0.6.0) (2019-08-28) # [0.6.0](https://github.com/saltstack-formulas/sysctl-formula/compare/v0.5.0...v0.6.0) (2019-08-28)

2
FORMULA
View File

@ -1,7 +1,7 @@
name: sysctl name: sysctl
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, MacOS os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, MacOS
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, MacOS os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, MacOS
version: 0.6.0 version: 0.6.1
release: 0 release: 0
minimum_version: 2017.7 minimum_version: 2017.7
summary: Sysctl formula summary: Sysctl formula

7
Gemfile
View File

@ -1,6 +1,7 @@
source "https://rubygems.org" # frozen_string_literal: true
source 'https://rubygems.org'
gem 'kitchen-docker', '>= 2.9' gem 'kitchen-docker', '>= 2.9'
gem 'kitchen-salt', '>= 0.6.0'
gem 'kitchen-inspec', '>= 1.1' gem 'kitchen-inspec', '>= 1.1'
gem 'kitchen-salt', '>= 0.6.0'

21
bin/kitchen
View File

@ -8,22 +8,25 @@
# this file is here to facilitate running it. # this file is here to facilitate running it.
# #
require "pathname" require 'pathname'
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
Pathname.new(__FILE__).realpath) Pathname.new(__FILE__).realpath)
bundle_binstub = File.expand_path("../bundle", __FILE__) bundle_binstub = File.expand_path('bundle', __dir__)
if File.file?(bundle_binstub) if File.file?(bundle_binstub)
if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
load(bundle_binstub) load(bundle_binstub)
else else
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. abort(
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") 'Your `bin/bundle` was not generated by Bundler, '\
'so this binstub cannot run. Replace `bin/bundle` by running '\
'`bundle binstubs bundler --force`, then run this command again.'
)
end end
end end
require "rubygems" require 'rubygems'
require "bundler/setup" require 'bundler/setup'
load Gem.bin_path("test-kitchen", "kitchen") load Gem.bin_path('test-kitchen', 'kitchen')

10
docs/AUTHORS.rst
View File

@ -15,10 +15,16 @@ This list is sorted by the number of commits per contributor in *descending* ord
- Contributions - Contributions
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>` * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
- `@aboe76 <https://github.com/aboe76>`_ - `@aboe76 <https://github.com/aboe76>`_
- 14 - 17
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
- `@myii <https://github.com/myii>`_
- 15
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>` * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>`
- `@babilen5 <https://github.com/babilen5>`_ - `@babilen5 <https://github.com/babilen5>`_
- 7 - 7
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>`
- `@n-rodriguez <https://github.com/n-rodriguez>`_
- 3
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>` * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
- `@nmadhok <https://github.com/nmadhok>`_ - `@nmadhok <https://github.com/nmadhok>`_
- 2 - 2
@ -41,4 +47,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
---- ----
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-08-28. Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-10.

23
docs/CHANGELOG.rst
View File

@ -2,6 +2,29 @@
Changelog Changelog
========= =========
`0.6.1 <https://github.com/saltstack-formulas/sysctl-formula/compare/v0.6.0...v0.6.1>`_ (2019-10-10)
--------------------------------------------------------------------------------------------------------
Bug Fixes
^^^^^^^^^
* **map.jinja:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/sysctl-formula/commit/6a08317>`_\ )
* **package.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/sysctl-formula/commit/a8bbd25>`_\ )
* **param.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/sysctl-formula/commit/50494dc>`_\ )
Continuous Integration
^^^^^^^^^^^^^^^^^^^^^^
* **kitchen:** change ``log_level`` to ``debug`` instead of ``info`` (\ ` <https://github.com/saltstack-formulas/sysctl-formula/commit/519d39b>`_\ )
* **kitchen:** install required packages to bootstrapped ``opensuse`` [skip ci] (\ ` <https://github.com/saltstack-formulas/sysctl-formula/commit/10a70f0>`_\ )
* **kitchen:** use bootstrapped ``opensuse`` images until ``2019.2.2`` [skip ci] (\ ` <https://github.com/saltstack-formulas/sysctl-formula/commit/1f2f4ce>`_\ )
* **platform:** add ``arch-base-latest`` (\ ` <https://github.com/saltstack-formulas/sysctl-formula/commit/d9dfd4b>`_\ )
* **yamllint:** add rule ``empty-values`` & use new ``yaml-files`` setting (\ ` <https://github.com/saltstack-formulas/sysctl-formula/commit/9fd2f1c>`_\ )
* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/sysctl-formula/commit/9d202ba>`_\ )
* use ``dist: bionic`` & apply ``opensuse-leap-15`` SCP error workaround (\ ` <https://github.com/saltstack-formulas/sysctl-formula/commit/c7e34a9>`_\ )
`0.6.0 <https://github.com/saltstack-formulas/sysctl-formula/compare/v0.5.0...v0.6.0>`_ (2019-08-28) `0.6.0 <https://github.com/saltstack-formulas/sysctl-formula/compare/v0.5.0...v0.6.0>`_ (2019-08-28)
-------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------

6
sysctl/map.jinja
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=jinja # vim: ft=jinja
{## Start with defaults from defaults.sls and osfamilymap.yml ##} {#- Start with defaults from defaults.sls and osfamilymap.yml #}
{% import_yaml 'sysctl/defaults.yml' as default_settings %} {% import_yaml 'sysctl/defaults.yml' as default_settings %}
{% import_yaml "sysctl/osfamilymap.yml" as os_family_map %} {% import_yaml "sysctl/osfamilymap.yml" as os_family_map %}
@ -18,7 +18,7 @@
) )
%} %}
{## Apply backwards compatiblility after merge ##} {#- Apply backwards compatiblility after merge #}
{% if default_settings['sysctl']['params'] is defined %} {% if default_settings['sysctl']['params'] is defined %}
{% do default_settings['sysctl'].pop('params') %} {% do default_settings['sysctl'].pop('params') %}
{% endif %} {% endif %}
@ -26,7 +26,7 @@
{% do default_settings['sysctl'].pop('params2') %} {% do default_settings['sysctl'].pop('params2') %}
{% endif %} {% endif %}
{## Merge in sysctl pillar ##} {#- Merge in sysctl pillar #}
{% set sysctl_settings = salt['pillar.get']( {% set sysctl_settings = salt['pillar.get'](
'sysctl', 'sysctl',
default=default_settings['sysctl'], default=default_settings['sysctl'],

2
sysctl/package.sls
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=sls # vim: ft=sls
{## import settings from map.jinja ##} {#- import settings from map.jinja #}
{%- from "sysctl/map.jinja" import sysctl_settings with context %} {%- from "sysctl/map.jinja" import sysctl_settings with context %}
sysctl-pkg: sysctl-pkg:

4
sysctl/param.sls
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=sls # vim: ft=sls
{## import settings from map.jinja ##} {#- import settings from map.jinja #}
{%- from "sysctl/map.jinja" import sysctl_settings with context %} {%- from "sysctl/map.jinja" import sysctl_settings with context %}
{% if sysctl_settings.params is defined %} {% if sysctl_settings.params is defined %}
@ -22,7 +22,7 @@ sysctl-present-{{ param_name }}:
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}
{## Support for legacy pillar structure ##} {#- Support for legacy pillar structure #}
{%- if sysctl_settings.lookup is defined %} {%- if sysctl_settings.lookup is defined %}
{% if sysctl_settings.lookup.params2 is defined -%} {% if sysctl_settings.lookup.params2 is defined -%}
{%- for param_name, param in sysctl_settings.lookup.get('params2', {}).items() -%} {%- for param_name, param in sysctl_settings.lookup.get('params2', {}).items() -%}