Merge "Add option to overrided minion id without scrict linux formula dependency"

README.rst

@@ -627,6 +627,18 @@ Syndicated master with multiple master of masters
 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
 
 .. code-block:: yaml

salt/files/master.conf

@@ -205,7 +205,7 @@ nacl.config:
 
 file_recv: {{ master.get('file_recv', False) }}
 
-id: {{ system.name }}.{{ system.domain }}
+id: {{ master.id | default(system.name~"."~system.domain) }}
 
 {#-
 vim: syntax=jinja

salt/files/minion.conf

@@ -21,7 +21,7 @@ master: {{ minion.master.host }}
 
 {%- endif %}
 
-id: {{ system.name }}.{{ system.domain }}
+id: {{ minion.id | default(system.name~"."~system.domain) }}
 
 {%- for opt in ['max_event_size', 'acceptance_wait_time_max',
   'acceptance_wait_time', 'random_reauth_delay', 'recon_default', 'recon_max',

tests/pillar/minion_multi_master_failover.sls

@@ -1,5 +1,6 @@
 salt:
   minion:
+    id: salt.ci.local
     enabled: true
     masters:
     - host: config01.dc01.domain.com