Browse Source

Merge pull request #358 from iustinam/pkgver

Add configuration for packages version
master
Javier Bértoli 6 years ago
parent
commit
fc202490a3
No account linked to committer's email address
8 changed files with 24 additions and 0 deletions
  1. +3
    -0
      pillar.example
  2. +3
    -0
      salt/api.sls
  3. +3
    -0
      salt/cloud.sls
  4. +3
    -0
      salt/master.sls
  5. +3
    -0
      salt/minion.sls
  6. +3
    -0
      salt/ssh.sls
  7. +3
    -0
      salt/standalone.sls
  8. +3
    -0
      salt/syndic.sls

+ 3
- 0
pillar.example View File

# install Salt via git/pip/etc.) # install Salt via git/pip/etc.)
install_packages: True install_packages: True


# Optional: set salt version (if install_packages is set to True)
version: 2017.7.2-1.el7

# to overwrite map.jinja salt packages # to overwrite map.jinja salt packages
lookup: lookup:
salt_master: 'salt-master' salt_master: 'salt-master'

+ 3
- 0
salt/api.sls View File

{% if salt_settings.install_packages %} {% if salt_settings.install_packages %}
pkg.installed: pkg.installed:
- name: {{ salt_settings.salt_api }} - name: {{ salt_settings.salt_api }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
{%- endif %}
{% endif %} {% endif %}
service.running: service.running:
- enable: True - enable: True

+ 3
- 0
salt/cloud.sls View File

salt-cloud: salt-cloud:
pkg.installed: pkg.installed:
- name: {{ salt_settings.salt_cloud }} - name: {{ salt_settings.salt_cloud }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
{%- endif %}
{%- if salt_settings.use_pip %} {%- if salt_settings.use_pip %}
- require: - require:
- pip: salt-cloud-pip-packages - pip: salt-cloud-pip-packages

+ 3
- 0
salt/master.sls View File

{% if salt_settings.install_packages %} {% if salt_settings.install_packages %}
pkg.installed: pkg.installed:
- name: {{ salt_settings.salt_master }} - name: {{ salt_settings.salt_master }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
{%- endif %}
{% endif %} {% endif %}
file.recurse: file.recurse:
- name: {{ salt_settings.config_path }}/master.d - name: {{ salt_settings.config_path }}/master.d

+ 3
- 0
salt/minion.sls View File

{% if salt_settings.install_packages %} {% if salt_settings.install_packages %}
pkg.installed: pkg.installed:
- name: {{ salt_settings.salt_minion }} - name: {{ salt_settings.salt_minion }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
{%- endif %}
{% endif %} {% endif %}
file.recurse: file.recurse:
- name: {{ salt_settings.config_path }}/minion.d - name: {{ salt_settings.config_path }}/minion.d

+ 3
- 0
salt/ssh.sls View File

ensure-salt-ssh-is-installed: ensure-salt-ssh-is-installed:
pkg.installed: pkg.installed:
- name: {{ salt_settings.salt_ssh }} - name: {{ salt_settings.salt_ssh }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
{%- endif %}
{% endif %} {% endif %}


ensure-roster-config: ensure-roster-config:

+ 3
- 0
salt/standalone.sls View File

{% if salt_settings.install_packages %} {% if salt_settings.install_packages %}
pkg.installed: pkg.installed:
- name: {{ salt_settings.salt_minion }} - name: {{ salt_settings.salt_minion }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
{%- endif %}
{% endif %} {% endif %}
file.recurse: file.recurse:
- name: {{ salt_settings.config_path }}/minion.d - name: {{ salt_settings.config_path }}/minion.d

+ 3
- 0
salt/syndic.sls View File

{% if salt_settings.install_packages %} {% if salt_settings.install_packages %}
pkg.installed: pkg.installed:
- name: {{ salt_settings.salt_syndic }} - name: {{ salt_settings.salt_syndic }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
{%- endif %}
{% endif %} {% endif %}
service.running: service.running:
- enable: True - enable: True

Loading…
Cancel
Save