2
0

Merge pull request from rhertzog/standalone

Add a “salt.standalone” state
This commit is contained in:
Wolodja Wentland 2014-12-22 00:02:37 +01:00
commit c8c0781e8f
4 changed files with 30 additions and 0 deletions

View File

@ -41,6 +41,12 @@ Install salt cloud.
Install salt-ssh with roster file. Install salt-ssh with roster file.
Configure pillar data under salt:ssh_roster to feed the template. Configure pillar data under salt:ssh_roster to feed the template.
``salt.standalone``
------------
Install a minion and configure it in `standalone mode
<docs.saltstack.com/en/latest/topics/tutorials/standalone_minion.html>`_.
``Configuration`` ``Configuration``
================= =================
Every option available in the templates can be set in pillar. Settings under 'salt' will be overridden by more specific settings under ``salt['master']``, ``salt['minion']`` or ``salt['cloud']`` Every option available in the templates can be set in pillar. Settings under 'salt' will be overridden by more specific settings under ``salt['master']``, ``salt['minion']`` or ``salt['cloud']``

View File

@ -386,7 +386,11 @@ id: {{ minion['id'] }}
# Set the file client. The client defaults to looking on the master server for # Set the file client. The client defaults to looking on the master server for
# files, but can be directed to look at the local file directory setting # files, but can be directed to look at the local file directory setting
# defined below by setting it to local. # defined below by setting it to local.
{%- if standalone %}
file_client: local
{%- else %}
{{ get_config('file_client', 'remote') }} {{ get_config('file_client', 'remote') }}
{%- endif %}
# The file directory works on environments passed to the minion, each environment # The file directory works on environments passed to the minion, each environment
# can have multiple root directories, the subdirectories in the multiple file # can have multiple root directories, the subdirectories in the multiple file

View File

@ -8,6 +8,8 @@ salt-minion:
- template: jinja - template: jinja
- source: salt://salt/files/minion.d - source: salt://salt/files/minion.d
- clean: True - clean: True
- context:
standalone: False
service.running: service.running:
- enable: True - enable: True
- name: {{ pkgs.get('minion-service', 'salt-minion') }} - name: {{ pkgs.get('minion-service', 'salt-minion') }}

18
salt/standalone.sls Normal file
View File

@ -0,0 +1,18 @@
{% from "salt/package-map.jinja" import pkgs with context %}
salt-minion:
pkg.installed:
- name: {{ pkgs['salt-minion'] }}
file.recurse:
- name: {{ pkgs.get('config-path', '/etc/salt') }}/minion.d
- template: jinja
- source: salt://salt/files/minion.d
- clean: True
- context:
standalone: True
service.dead:
- enable: False
- name: {{ pkgs.get('minion-service', 'salt-minion') }}
- require:
- pkg: salt-minion
- file: salt-minion