mirror of
https://github.com/saltstack-formulas/packages-formula.git
synced 2025-04-17 10:10:27 +00:00
fix(pips.sls): use tplroot
instead of slspath
* Evaluates wrongly on Debian to `salt://packages/pips/files/pip.conf` - https://travis-ci.org/myii/packages-formula/jobs/636188022#L7867
This commit is contained in:
parent
16c4213ab9
commit
a4e9311a35
1 changed files with 5 additions and 2 deletions
|
@ -1,6 +1,9 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# vim: ft=sls
|
# vim: ft=sls
|
||||||
{% from "packages/map.jinja" import packages with context %}
|
|
||||||
|
{#- Get the `tplroot` from `tpldir` #}
|
||||||
|
{%- set tplroot = tpldir.split('/')[0] %}
|
||||||
|
{%- from tplroot ~ "/map.jinja" import packages with context %}
|
||||||
|
|
||||||
{% set req_states = packages.pips.required.states %}
|
{% set req_states = packages.pips.required.states %}
|
||||||
{% set req_pkgs = packages.pips.required.pkgs %}
|
{% set req_pkgs = packages.pips.required.pkgs %}
|
||||||
|
@ -24,7 +27,7 @@ pip_req_pkgs:
|
||||||
pip_config:
|
pip_config:
|
||||||
file.managed:
|
file.managed:
|
||||||
- name: /etc/pip.conf
|
- name: /etc/pip.conf
|
||||||
- source: salt://{{ slspath }}/files/pip.conf
|
- source: salt://{{ tplroot }}/files/pip.conf
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- makedirs: True
|
- makedirs: True
|
||||||
- context:
|
- context:
|
||||||
|
|
Loading…
Add table
Reference in a new issue