Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Silence warnings about "__prerequired__" being an invalid kwarg when using prereq with supervisord states. #37090

Merged
merged 1 commit into from
Oct 20, 2016
Merged

Silence warnings about "__prerequired__" being an invalid kwarg when using prereq with supervisord states. #37090

merged 1 commit into from
Oct 20, 2016

Conversation

zer0def
Copy link
Contributor

@zer0def zer0def commented Oct 19, 2016

What does this PR do?

Fixes prereq requisite behavior with supervisord states, similarly to #29463 .

Example SLS:

{% set process_name = 'asdf' %}

asdf-setup:
  pkg.installed:
    - name: supervisor
    - refresh: true
  service.running:
    - name: supervisor
    - enable: true
    - require:
      - pkg: asdf-setup
  file.managed:
    - name: /etc/supervisor/conf.d/{{ process_name }}.conf
    - contents: |
        [program:{{ process_name }}]
        command = /bin/bash -c 'while true; do sleep 15; done'
        autostart = true
        autorestart = true
    - require:
      - pkg: asdf-setup
  cmd.run:  # guarantee an always populated `changes` dict
    - name: lsb_release -a
    - require:
      - file: asdf-setup

asdf-dead:
  supervisord.dead:
    - name: {{ process_name }}
    - prereq:
      - cmd: asdf-setup

asdf-running:
  supervisord.running:
    - name: {{ process_name }}
    - update: true
    - onchanges:
      - cmd: asdf-setup

Previous Behavior

state.sls run:

ubuntu16:
  Name: supervisor - Function: pkg.installed - Result: Clean
  Name: supervisor - Function: service.running - Result: Clean
  Name: /etc/supervisor/conf.d/asdf.conf - Function: file.managed - Result: Clean
Warnings:
'__prerequired__' is an invalid keyword argument for 'supervisord.dead'. If you were trying to pass additional data to be used in a template context, please populate 'context' with 'key: value' pairs. Your approach will work until Salt Carbon is out. Please update your state files.  Name: asdf - Function: supervisord.dead - Result: Changed
  Name: lsb_release -a - Function: cmd.run - Result: Changed
  Name: asdf - Function: supervisord.running - Result: Changed

Summary for ubuntu16
------------
Succeeded: 6 (changed=3)
Failed:    0
------------
Total states run:     6

New Behavior

state.sls run:

ubuntu16:
  Name: supervisor - Function: pkg.installed - Result: Clean
  Name: supervisor - Function: service.running - Result: Clean
  Name: /etc/supervisor/conf.d/asdf.conf - Function: file.managed - Result: Clean
  Name: asdf - Function: supervisord.dead - Result: Changed
  Name: lsb_release -a - Function: cmd.run - Result: Changed
  Name: asdf - Function: supervisord.running - Result: Changed

Summary for ubuntu16
------------
Succeeded: 6 (changed=3)
Failed:    0
------------
Total states run:     6

Tests written?

No

@cachedout cachedout merged commit 2f29e9e into saltstack:2015.8 Oct 20, 2016
rmader added a commit to rmader/salt that referenced this pull request Aug 29, 2017
This silences an error message when using prereq with the salt.state state.

See saltstack#29463 and saltstack#37090
rmader added a commit to rmader/salt that referenced this pull request Aug 29, 2017
This silences an error message when using prereq with some file state.

See saltstack#29463 and saltstack#37090
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants