forked from saltstack-formulas/salt-formula
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request saltstack-formulas#156 from iggy/revert_bad
Revert bad
- Loading branch information
Showing
6 changed files
with
7 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,74 +1,16 @@ | ||
#!jinja|yaml | ||
|
||
{% from "salt/map.jinja" import salt_settings with context %} | ||
{%- set cfg_salt = pillar.get('salt', {}) %} | ||
{%- set cfg_master = cfg_salt.get('master', {}) %} | ||
{%- set use_pip = salt['pillar.get']('salt:api:use_pip', False) %} | ||
include: | ||
- salt.master | ||
{%- if use_pip %} | ||
- pip.extensions | ||
{%- endif %} | ||
salt_api_install: | ||
salt-api: | ||
{% if salt_settings.install_packages %} | ||
pkg.installed: | ||
- name: {{ salt_settings['salt_api'] }} | ||
- name: {{ salt_settings.salt_api }} | ||
{% endif %} | ||
service.running: | ||
- name: {{ salt_settings.get('api_service', 'salt-api') }} | ||
- name: {{ salt_settings.api_service }} | ||
- require: | ||
{%- if use_pip %} | ||
{%- if 'rest_cherrypy' in cfg_master %} | ||
- pip: salt_api_cherrypy | ||
{%- elif 'rest_tornado' in cfg_master %} | ||
- pip: salt_api_tornado | ||
{%- endif %} | ||
{%- else %} # if use_pip | ||
{%- if 'rest_cherrypy' in cfg_master %} | ||
- pkg: salt_api_cherrypy | ||
{%- elif 'rest_tornado' in cfg_master %} | ||
- pkg: salt_api_tornado | ||
{%- endif %} | ||
{%- endif %} | ||
- service: {{ salt_settings.master_service }} | ||
- watch: | ||
- pkg: salt-master | ||
- file: salt-master | ||
{%- if use_pip %} | ||
{%- if 'rest_cherrypy' in cfg_master %} | ||
salt_api_cherrypy: | ||
pkg.purged: | ||
- name: {{ salt_settings.python_cherrypy }} | ||
pip.installed: | ||
- name: cherrypy | ||
- require: | ||
- pkg: salt_api_cherrypy | ||
- pkg: pip_extensions | ||
{% endif %} | ||
{%- if 'rest_tornado' in cfg_master %} | ||
salt_api_tornado: | ||
pkg.purged: | ||
- name: {{ salt_settings.python_tornado }} | ||
pip.installed: | ||
- name: tornado | ||
- require: | ||
- pkg: salt_api_tornado | ||
- pkg: pip_extensions | ||
{% endif %} | ||
{%- else %} # if use_pip | ||
{% if 'rest_cherrypy' in cfg_master %} | ||
salt_api_cherrypy: | ||
pkg.installed: | ||
- name: {{ salt_settings.python_cherrypy }} | ||
{% endif %} | ||
{% if 'rest_tornado' in cfg_master %} | ||
salt_api_tornado: | ||
pkg.installed: | ||
- name: {{ salt_settings.python_tornado }} | ||
{% endif %} | ||
{%- endif %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,6 @@ GitPython: | |
{% else %} | ||
python-git: | ||
pkg.installed: | ||
- name: {{ salt_settings.python_git }} | ||
pkg.installed | ||
{% endif %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters