fix(minion): fix requisites from recent prs

[noelmcloughlin]

PR progress checklist (to be filled in by reviewers)

• [x] Changes to documentation are appropriate (or tick if not required)
• [x] Changes to tests are appropriate (or tick if not required)
• [ ] Reviews completed

---

What type of PR is this?

Primary type

• [ ] [build] Changes related to the build system
• [ ] [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
• [ ] [ci] Changes to the continuous integration configuration
• [ ] [feat] A new feature
• [x] [fix] A bug fix
• [ ] [perf] A code change that improves performance
• [ ] [refactor] A code change that neither fixes a bug nor adds a feature
• [ ] [revert] A change used to revert a previous commit
• [ ] [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

• [x] [docs] Documentation changes
• [x] [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

Fix #475

Describe the changes you're proposing

See #475

Pillar / config required to test the proposed changes

Debug log showing how the proposed changes work

Documentation checklist

• [ ] Updated the README (e.g. Available states).
• [ ] Updated pillar.example.

Testing checklist

• [ ] Included in Kitchen (i.e. under state_top).
• [ ] Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
• [ ] Updated the relevant test pillar.

Additional context

[pull-assistant[bot]]

Best reviewed: commit by commit

---

Optimal code review plan

     fix(minion): fix requisites from recent prs

Powered by Pull Assistant. Last update a466456 ... a466456. Read the comment docs.

[prannonpendragas]

Tested:

Gitfs config for this formula below:

    - https://github.com/noelmcloughlin/salt-formula.git:
      - all_saltenvs: a46645607b3e20cf2f69a51e976457c201830c4c

Executions on master node:

[08:34:16][root]@[foundation01][/srv]$ salt-call state.apply salt.minion
local:
----------
          ID: salt-minion
    Function: pkg.installed
      Result: True
     Comment: All specified packages are already installed
     Started: 08:39:03.023091
    Duration: 32.669 ms
     Changes:   
----------
          ID: salt-minion
    Function: file.recurse
        Name: /etc/salt/minion.d
      Result: True
     Comment: The directory /etc/salt/minion.d is in the correct state
     Started: 08:39:03.058575
    Duration: 375.924 ms
     Changes:   
----------
          ID: remove-old-minion-conf-file
    Function: file.absent
        Name: /etc/salt/minion.d/_defaults.conf
      Result: True
     Comment: File /etc/salt/minion.d/_defaults.conf is not present
     Started: 08:39:03.435386
    Duration: 0.285 ms
     Changes:   
----------
          ID: salt-minion
    Function: service.running
      Result: True
     Comment: The service salt-minion is already running
     Started: 08:39:03.435826
    Duration: 42.624 ms
     Changes:   
----------
          ID: salt-minion
    Function: cmd.run
        Name: salt-call --local service.restart salt-minion --out-file /dev/null
      Result: True
     Comment: State was not run because none of the onchanges reqs changed
     Started: 08:39:03.480725
    Duration: 0.008 ms
     Changes:   

Summary for local
------------
Succeeded: 5
Failed:    0
------------
Total states run:     5
Total run time: 451.510 ms

[08:39:03][root]@[foundation01][/srv]$ salt-call state.apply salt.master
local:
----------
          ID: salt-master
    Function: pkg.installed
      Result: True
     Comment: All specified packages are already installed
     Started: 08:40:04.787669
    Duration: 32.517 ms
     Changes:   
----------
          ID: salt-master
    Function: file.recurse
        Name: /etc/salt/master.d
      Result: True
     Comment: Recursively updated /etc/salt/master.d
     Started: 08:40:04.823066
    Duration: 397.693 ms
     Changes:   
              ----------
              /etc/salt/master.d/f_defaults.conf:
                  ----------
                  diff:
                      --- 
                      +++ 
                      @@ -847,8 +847,8 @@
                             - all_saltenvs: master
                           - https://github.com/compunautics/rundeck-formula.git:
                             - all_saltenvs: master
                      -    - https://github.com/noelmcloughlin/salt-formula.git:
                      -      - all_saltenvs: a46645607b3e20cf2f69a51e976457c201830c4c
                      +    - https://github.com/saltstack-formulas/salt-formula.git:
                      +      - all_saltenvs: db8570609ce3a167a4759f03fec42ef2db28093d
                           - https://github.com/compunautics/sssd-formula.git:
                             - all_saltenvs: master
                           - https://github.com/compunautics/telegraf-formula.git:
              removed:
                  - /etc/salt/master.d/.f_defaults.conf.swp
----------
          ID: remove-old-master-conf-file
    Function: file.absent
        Name: /etc/salt/master.d/_defaults.conf
      Result: True
     Comment: File /etc/salt/master.d/_defaults.conf is not present
     Started: 08:40:05.228020
    Duration: 0.291 ms
     Changes:   
----------
          ID: salt-master
    Function: service.running
      Result: True
     Comment: Service restarted
     Started: 08:40:05.280641
    Duration: 960.448 ms
     Changes:   
              ----------
              salt-master:
                  True

Summary for local
------------
Succeeded: 4 (changed=2)
Failed:    0
------------
Total states run:     4
Total run time:   1.391 s

Appears to have removed the previous error.

[noelmcloughlin]

Can you formally review the PR @ixs and we can merge.

[myii]

Merged, thanks to all involved for getting this resolved.

[saltstack-formulas-travis]

:tada: This PR is included in version 1.5.0 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket: