feat(init): allow no-pillar init state & pr comments

Author: noelmcloughlin

docs/README.rst

@@ -43,7 +43,7 @@ Available states
 ----------------
 
 .. contents::
-   :local:
+    :local:
 
 ``salt``
 ^^^^^^^^

pillar.example

@@ -260,10 +260,12 @@ salt:
         - test.ping
         - saltutil.find_job
 
-  # customize init.sls behaviour (run api and/or syndic too)
-  extra_init_states:
-    - api
-    - syndic
+  # include these in init.sls metastate (default no)
+  api:
+    part_of_init_metastate: true
+  syndic:
+    part_of_init_metastate: true
+
 
   # salt cloud config
   cloud:

salt/defaults.yaml

@@ -36,10 +36,9 @@ salt:
   minion:
     master_type: True
 
-  ## init state helpers
-  pkgrepo: None          #via map jinja
-  ssh_roster: None       #via pillar data
-  extra_init_states: []  #via pillar data
+  ## init.sls helpers
+  pkgrepo: None          #see osfamilymap
+  ssh_roster: None       #see pillar data
 
   gitfs:
     dulwich:

salt/init.sls

@@ -1,27 +1,25 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-        {%- if salt.pillar.get('salt') %}
 include:
-    - salt.pkgrepo
-          {%- if salt.pillar.get('salt_formulas:list') %}
-    - salt.formulas
-          {%- endif %}
-          {%- if salt.pillar.get('salt:master')|length > 1 %}
-    - salt.master
-          {%- endif %}
-          {%- if salt.pillar.get('salt:cloud')|length > 1 %}
-    - salt.cloud
-          {%- endif %}
-          {%- if salt.pillar.get('salt:ssh_roster') %}
-    - salt.ssh
-          {%- endif %}
-    - salt.standalone
-    - salt.minion
-          {%- if salt.pillar.get('salt:extra_init_states:api') %}
-    - salt.api
-          {%- endif %}
-          {%- if salt.pillar.get('salt:extra_init_states:syndic') %}
-    - salt.syndic
-          {%- endif %}
-        {%- endif %}
+  - salt.pkgrepo
+      {%- if salt.config.get('salt_formulas:list') %}
+  - salt.formulas
+      {%- endif %}
+      {%- if salt.config.get('salt:master')|length > 1 %}
+  - salt.master
+      {%- endif %}
+      {%- if salt.config.get('salt:cloud')|length > 1 %}
+  - salt.cloud
+      {%- endif %}
+      {%- if salt.config.get('salt:ssh_roster') %}
+  - salt.ssh
+      {%- endif %}
+  - salt.standalone
+  - salt.minion
+      {%- if salt.config.get('salt:api') %}
+  - salt.api
+      {%- endif %}
+      {%- if salt.config.get('salt:syndic') %}
+  - salt.syndic
+      {%- endif %}

salt/pkgrepo/init.sls

@@ -2,9 +2,9 @@
 # vim: ft=sls
 {% from "salt/map.jinja" import salt_settings with context %}
 
-    {%- if salt_settings.pkgrepo %}
+  {%- if salt_settings.pkgrepo %}
 
 include:
   - .{{ grains['os_family']|lower }}
 
-    {%- endif %}
+  {%- endif %}

salt/standalone.sls

@@ -1,6 +1,6 @@
 {% from "salt/map.jinja" import salt_settings with context %}
 
-salt-minion:
+salt-minion-standalone:
   {% if salt_settings.install_packages %}
   pkg.installed:
     - name: {{ salt_settings.salt_minion }}
@@ -27,9 +27,9 @@ salt-minion:
     - name: {{ salt_settings.minion_service }}
     - require:
   {% if salt_settings.install_packages %}
-      - pkg: salt-minion
+      - pkg: salt-minion-standalone
   {% endif %}
-      - file: salt-minion
+      - file: salt-minion-standalone
 
 # clean up old _defaults.conf file if they have it around
 remove-old-standalone-conf-file: