Pārlūkot izejas kodu

Add option to overrided minion id without scrict linux formula dependency

Change-Id: I602338811610d4ff08dfb8b2b3aed9dc46f5b3b0
pull/73/head
Petr Michalec pirms 6 gadiem
vecāks
revīzija
cfd93e1e91
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam
4 mainītis faili ar 15 papildinājumiem un 2 dzēšanām
  1. +12
    -0
      README.rst
  2. +1
    -1
      salt/files/master.conf
  3. +1
    -1
      salt/files/minion.conf
  4. +1
    -0
      tests/pillar/minion_multi_master_failover.sls

+ 12
- 0
README.rst Parādīt failu

Salt Minion Salt Minion
----------- -----------


Minion ID by default trigger dependency on linux formula, as it uses fqdn configured from `linux.system.name` and
`linux.system.domain` pillar. To override, provide exact minion ID you require. The same can be sate for master id rendered
at `master.conf`.

.. code-block:: yaml

salt:
minion:
id: minion1.production
master:
id: master.production

Simplest Salt minion setup with central configuration node Simplest Salt minion setup with central configuration node


.. code-block:: yaml .. code-block:: yaml

+ 1
- 1
salt/files/master.conf Parādīt failu



file_recv: {{ master.get('file_recv', False) }} file_recv: {{ master.get('file_recv', False) }}


id: {{ system.name }}.{{ system.domain }}
id: {{ master.id | default(system.name~"."~system.domain) }}


{#- {#-
vim: syntax=jinja vim: syntax=jinja

+ 1
- 1
salt/files/minion.conf Parādīt failu



{%- endif %} {%- endif %}


id: {{ system.name }}.{{ system.domain }}
id: {{ minion.id | default(system.name~"."~system.domain) }}


{%- for opt in ['max_event_size', 'acceptance_wait_time_max', {%- for opt in ['max_event_size', 'acceptance_wait_time_max',
'acceptance_wait_time', 'random_reauth_delay', 'recon_default', 'recon_max', 'acceptance_wait_time', 'random_reauth_delay', 'recon_default', 'recon_max',

+ 1
- 0
tests/pillar/minion_multi_master_failover.sls Parādīt failu

salt: salt:
minion: minion:
id: salt.ci.local
enabled: true enabled: true
masters: masters:
- host: config01.dc01.domain.com - host: config01.dc01.domain.com

Notiek ielāde…
Atcelt
Saglabāt