Merge pull request #217 from prometheanfire/fix-module.run

allow use of new state syntax for module.run

linux/network/host.sls

 
 linux_host_{{ name }}_order_fix:
   module.run:
+{%- if 'module.run' in salt['config.get']('use_superseded', default=[]) %}
+    - file.replace:
+      - path: /etc/hosts
+      - pattern: {{ before }}
+      - repl: {{ after }}
+{%- else %}
     - name: file.replace
     - path: /etc/hosts
     - pattern: {{ before }}
     - repl: {{ after }}
+{%- endif %}
     - watch:
       - host: linux_host_{{ name }}
     - onlyif:

linux/network/openvswitch.sls

     - template: jinja
     - require:
       - pkg: openvswitch_pkgs
+
+openvswitch_sytemctl_reload:
   module.run:
+{%- if 'module.run' in salt['config.get']('use_superseded', default=[]) %}
+    - service.systemctl_reload: []
+{%- else %}
     - name: service.systemctl_reload
+{%- endif %}
     - onchanges:
       - file: /etc/systemd/system/openvswitch-switch.service
 

linux/storage/disk.sls

 
 create_disk_label_{{ disk_name }}:
   module.run:
+  {%- if 'module.run' in salt['config.get']('use_superseded', default=[]) %}
+  - partition.mklabel:
+    - device: {{ disk_name }}
+    - label_type: {{ disk.get('type', 'dos') }}
+  {%- else %}
   - name: partition.mklabel
   - device: {{ disk_name }}
   - label_type: {{ disk.get('type', 'dos') }}
+  {%- endif %}
   - unless: "fdisk -l {{ disk_name }} | grep -i 'Disklabel type: {{ disk.get('type', 'dos') }}'"
   - require:
     - pkg: parted
 
 create_partition_{{ disk_name }}_{{ loop.index }}:
   module.run:
+  {%- if 'module.run' in salt['config.get']('use_superseded', default=[]) %}
+  - partition.mkpart:
+    - device: {{ disk_name }}
+    - part_type: primary
+      {%- if partition.type is defined %}
+    - fs_type: {{ partition.type }}
+      {%- endif %}
+    - start: {{ end_size }}MB
+    - end: {{ end_size + partition.size }}MB
+  {%- else %}
   - name: partition.mkpart
   - device: {{ disk_name }}
   - part_type: primary
-  {%- if partition.type is defined %}
+    {%- if partition.type is defined %}
   - fs_type: {{ partition.type }}
-  {%- endif %}
+    {%- endif %}
   - start: {{ end_size }}MB
   - end: {{ end_size + partition.size }}MB
+  {%- endif %}
   - unless: "blkid {{ disk_name }}{{ loop.index }} {{ disk_name }}p{{ loop.index }}"
   - require:
     - module: create_disk_label_{{ disk_name }}
 
 probe_partions_{{ disk_name }}:
   module.run:
+{%- if 'module.run' in salt['config.get']('use_superseded', default=[]) %}
+  - partition.probe:
+    - device: {{ disk_name }}
+{%- else %}
   - name: partition.probe
   - device: {{ disk_name }}
+{%- endif %}
 
 {%- for partition in disk.get('partitions', []) %}
 
 
 mkfs_partition_{{ disk_name }}_{{ loop.index }}:
   module.run:
+  {%- if 'module.run' in salt['config.get']('use_superseded', default=[]) %}
+  - xfs.mkfs:
+    - device: {{ disk_name }}{{ loop.index }}
+  {%- else %}
   - name: xfs.mkfs
   - device: {{ disk_name }}{{ loop.index }}
+  {%- endif %}
   - unless: "blkid {{ disk_name }}{{ loop.index }} {{ disk_name }}p{{ loop.index }} | grep xfs"
   - require:
     - module: create_partition_{{ disk_name }}_{{ loop.index }}

linux/storage/swap.sls

 
 {{ swap.device }}:
   module.run:
+  {%- if 'module.run' in salt['config.get']('use_superseded', default=[]) %}
+    - mount.rm_fstab:
+      - m_name: none
+      - device: {{ swap.device }}
+  {%- else %}
     - name: mount.rm_fstab
     - m_name: none
     - device: {{ swap.device }}
+  {%- endif %}
     - onlyif: grep -q {{ swap.device }} /etc/fstab
 
 linux_disable_swap_{{ swap.engine }}_{{ swap.device }}:

linux/system/cpu.sls

 {% if salt['file.file_exists']('/sys/'+ core_key) %}
 governor_write_sysfs_cpu_core_{{ cpu_core }}:
   module.run:
+  {%- if 'module.run' in salt['config.get']('use_superseded', default=[]) %}
+    - sysfs.write:
+      - key: {{ core_key }}
+      - value: {{ system.cpu.governor }}
+  {%- else %}
     - name: sysfs.write
     - key: {{ core_key }}
     - value: {{ system.cpu.governor }}
+  {%- endif %}
 {% endif %}
 
 {%- endfor %}

linux/system/repo.sls

 refresh_db:
   {%- if system.get('refresh_repos_meta', True) %}
   module.run:
+    {%- if 'module.run' in salt['config.get']('use_superseded', default=[]) %}
+    - pkg.refresh_db: []
+    {%- else %}
     - name: pkg.refresh_db
+    {% endif %}
   {%- else %}
   test.succeed_without_changes
   {%- endif %}

linux/system/sysfs.sls

       {#- Sysfs cannot be set in docker, LXC, etc. #}
 linux_sysfs_write_{{ list_idx }}_{{ name }}_{{ key }}:
   module.run:
+        {%- if 'module.run' in salt['config.get']('use_superseded', default=[]) %}
+    - sysfs.write:
+      - key: {{ key }}
+      - value: {{ value }}
+        {%- else %}
     - name: sysfs.write
     - key: {{ key }}
     - value: {{ value }}
+        {%- endif %}
       {%- endif %}
     {%- endif %}
   {%- endfor %}