fix(issues): file various minor issues

Author: noelmcloughlin

mongodb/config/alternatives/clean.sls

@@ -33,4 +33,12 @@
             {%- endfor %}                  {# component #}
         {%- endif %}                       {# wanted #}
     {%- endfor %}                          {# components #}
-{%- endif %}                               {# linux #}
+
+{%- else %}
+
+{{ formula }}-config-alternatives-clean-notification:
+  test.show_notification:
+    - text: |
+        Note: The linux alternatives state is not applicable for {{ grains.os }}
+
+{%- endif %}                               {# os #}

mongodb/config/alternatives/install.sls

@@ -58,4 +58,12 @@ include:
             {%- endfor %}                  {# component #}
         {%- endif %}                       {# wanted #}
     {%- endfor %}                          {# components #}
-{%- endif %}                               {# linux #}
+
+{%- else %}
+
+{{ formula }}-config-alternatives-install-notification:
+  test.show_notification:
+    - text: |
+        Note: The linux alternatives state is not applicable for {{ grains.os }}
+
+{%- endif %}                               {# os #}

mongodb/config/clean.sls

@@ -37,7 +37,7 @@ include:
     - names:
             {%- if 'service' in software and software['service'] is mapping %}
                 {%- set servicename = name if 'service' not in software else software.service.name %}
-      - {{ d.dir.etc }}/{{ servicename|replace('org.mongo.mongodb.', '') }}.yml
+      - {{ d.dir.etc }}/{{ servicename|replace('org.mongo.mongodb.', '') }}.conf
             {%- endif %}
             {%- if 'config_file' in software and 'config' in software and software['config'] is mapping %}
       - {{ software['config_file'] }}

mongodb/config/file.sls

@@ -33,7 +33,7 @@ include:
 
 {{ formula }}-config-file-{{ servicename }}-file-managed:
   file.managed:
-    - name: {{ d.dir.etc }}/{{ servicename|replace('org.mongo.mongodb.', '') }}.yml
+    - name: {{ d.dir.etc }}/{{ servicename|replace('org.mongo.mongodb.', '') }}.conf
     - source: {{ files_switch(['config.yml.jinja'],
                               lookup=formula ~ '-config-file-' ~ servicename ~ '-file-managed'
                  )

mongodb/install.sls

@@ -180,7 +180,7 @@ include:
                                     {#- SYMLINK INSTALL #}
 
                         {%- if grains.kernel|lower in ('linux', 'darwin') %}
-                            {%- if package in ('archve', 'macapp') %}
+                            {%- if package in ('archive', 'macapp') %}
                                 {%- if d.linux.altpriority|int <= 0 or grains.os_family in ('MacOS', 'Arch') %}
                                     {%- if 'commands' in software  and software['commands'] is iterable %}
                                         {%- for cmd in software['commands'] %}
@@ -246,6 +246,7 @@ include:
                         {%- elif grains.kernel == 'Darwin' %}
                             {%- set servicename = name if 'name' not in service else service.name %}
 
+    - require_in:
       - file: {{ formula }}-{{ comp }}-{{ servicename }}-install-service-launched
 
 {{ formula }}-{{ comp }}-{{ servicename }}-install-service-launched:

mongodb/service/running.sls

@@ -11,16 +11,18 @@ include:
   - {{ sls_config_users }}
   - {{ sls_software_install }}
 
+    {%- if grains.kernel|lower == 'linux' %}
 {{ formula }}-service-running-prerequisites:
   file.managed:
     - name: /etc/init.d/disable-transparent-hugepages
     - source: salt://{{ formula }}/files/disable-transparent-hugepages.init
-    - unless: test -f /etc/init.d/disable-transparent-hugepages
+    - unless: test -f /etc/init.d/disable-transparent-hugepages 2>/dev/null
     - onlyif: {{ d.wanted.disable_transparent_hugepages }}
     - mode: '0755'
     - makedirs: True
     - require:
       - sls: {{ sls_software_install }}
+      - sls: {{ sls_config_users }}
   cmd.run:
     - name: echo never >/sys/kernel/mm/transparent_hugepage/enabled
     - onlyif: {{ d.wanted.disable_transparent_hugepages }}
@@ -35,6 +37,7 @@ include:
     - onlyif: systemctl list-units | grep firewalld >/dev/null 2>&1
     - enable: True
         {%- endif %}
+    {%- endif %}
 
     {%- for comp in d.software_component_matrix %}
         {%- if comp in d.wanted and d.wanted is iterable and comp in d.pkg and d.pkg[comp] is mapping %}
@@ -96,7 +99,7 @@ include:
   selinux.fcontext_policy_present:
     - name: '{{ config['storage']['dbPath'] }}(/.*)?'
     - sel_type: {{ name }}_var_lib_t
-    - require:
+    - onchanges:
       - file: {{ formula }}-service-running-{{ comp }}-{{ servicename }}-install-datapath
     - require_in:
       - selinux: {{ formula }}-service-running-{{ comp }}-{{ servicename }}-selinux-applied
@@ -192,7 +195,7 @@ include:
                             {%- endif %}
 
                         {%- endif %}  {# config #}
-                        {%- if d.wanted.firewall and 'firewall' in software %}
+                        {%- if grains.kernel == 'Linux' and d.wanted.firewall and 'firewall' in software %}
 
 {{ formula }}-service-running-{{ comp }}-{{ servicename }}-firewall-present:
   firewalld.present:

pillar.example

@@ -17,7 +17,6 @@ mongodb:
     connectors:
       # bi   # enterprise subscription only
       - kafka
-    upstream_repo: false
 
   pkg:
     deps:

test/integration/default/controls/archive_spec.rb

@@ -90,13 +90,13 @@
     its('owner') { should eq 'root' }
     its('group') { should eq 'root' }
   end
-  describe file('/etc/mongodb/mongod.yml') do
+  describe file('/etc/mongodb/mongod.conf') do
     it { should exist }
     its('mode') { should cmp '0644' }
     # its('owner') { should eq 'mongodb' }
     # its('group') { should eq 'mongodb' }
   end
-  describe file('/etc/mongodb/mongos.yml') do
+  describe file('/etc/mongodb/mongos.conf') do
     it { should exist }
     its('mode') { should cmp '0644' }
     its('owner') { should eq 'mongos' }