Skip to content
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

Minion, allow any module configuration #70

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ suites:
- minion_handler
- minion_local_pillar
- minion_local_reclass
- minion_config
pillars-from-files:
minion_pki.sls: tests/pillar/minion_pki_ca.sls
minion_mine.sls: tests/pillar/minion_mine.sls
Expand All @@ -86,6 +87,7 @@ suites:
minion_local_pillar.sls: tests/pillar/minion_local_pillar.sls
minion_local_reclass.sls: tests/pillar/minion_local_reclass.sls
minion_backend_urllib.sls: tests/pillar/minion_backend_urllib.sls
minion_config.sls: tests/pillar/minion_config.sls

- name: master-default
provisioner:
Expand Down
31 changes: 31 additions & 0 deletions salt/minion/service.sls
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,37 @@ salt_minion_dependency_packages:
- require:
- {{ minion.install_state }}

{#- Salt minion module additional configuration. Salt supports hundreds of modules, this formula pillar systematically structured #}
{#- provides support for most frequently used modules. In order to provide additional support to configure whatever configuration #}
{#- in ``minion.conf`` for any module without a need of dedicated formula dependency specify `salt:minion:config` pillar. #}

{#- If you intend add minion configuration for any existing salt-formula please use <formula repo>/<formula>/meta/salt.yml #}

{#- This pillar is expected be used while ``masterless``, ``salt --local``, to configure modules without support in salt-formula. #}
{#- in salt state calls. It's not documented in README.rst as we recognize it a bad pattern for salt-formulas ecosystem. Example: #}
{#- salt: #}
{#- minion: #}
{#- config: #}
{#- influxdb: #}
{#- host: localhost #}
{#- port: 8086 #}
{#- mysqlite: #}
{#- driver: sqlite3 #}
{%- if minion.config is mapping %}
salt_minion_config_present:
file.serialize:
- name: /etc/salt/minion.d/minion.conf
- dataset_pillar: salt:minion:config
- formatter: yaml
- merge_if_exists: True
- makedirs: True
- require:
- {{ minion.install_state }}
- require_in:
- service: {{ minion.service }}
{%- endif %}


{%- for service_name, service in pillar.items() %}
{%- set support_fragment_file = service_name+'/meta/salt.yml' %}
{%- macro load_support_file() %}{% include support_fragment_file ignore missing %}{% endmacro %}
Expand Down
9 changes: 9 additions & 0 deletions tests/integration/minion-default/minion_config_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@


describe file('/etc/salt/minion.d/minion.conf') do
it('should exist')
its('content') { should match /influxdb:/ }
its('content') { should match /^ port: 8086/ }
its('content') { should match /mysqlite:/ }
end

11 changes: 11 additions & 0 deletions tests/pillar/minion_config.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
salt:
minion:
enabled: true
master:
host: config01.dc01.domain.com
config:
influxdb:
host: localhost
port: 8086
mysqlite:
driver: sqlite3