Add enablerepo option to php-salt-formula
This commit is contained in:
parent
df0224fd35
commit
324ebd84af
@ -75,15 +75,15 @@ php_ppa_{{ state }}:
|
|||||||
{% elif grains['os_family'] == "RedHat" and (state == 'cli' or state == 'fpm' or state == 'php') %}
|
{% elif grains['os_family'] == "RedHat" and (state == 'cli' or state == 'fpm' or state == 'php') %}
|
||||||
{% set use_scl_repo = salt['pillar.get']('php:use_scl_repo', False) %}
|
{% set use_scl_repo = salt['pillar.get']('php:use_scl_repo', False) %}
|
||||||
{% set scl_php_version = salt['pillar.get']('php:scl_php_version', 71) %}
|
{% set scl_php_version = salt['pillar.get']('php:scl_php_version', 71) %}
|
||||||
|
{% set enable_php_repo = salt['pillar.get']('php:ng:lookup:enable_php_repo', False) %}
|
||||||
{% if use_scl_repo and grains['os'] == 'CentOS' %}
|
{% if use_scl_repo and grains['os'] == 'CentOS' %}
|
||||||
php_centos_scl_enable_{{ state }}:
|
php_centos_scl_enable_{{ state }}:
|
||||||
pkg.installed:
|
pkg.installed:
|
||||||
- name: centos-release-scl
|
pkg.installed:
|
||||||
{% elif use_scl_repo and grains['os'] == 'RedHat' %}
|
- name: {{ state }}
|
||||||
php_redhat_scl_enable_{{ state }}:
|
- pkgs: {{ pkgs|json() }}
|
||||||
cmd.run:
|
{% if enable_php_repo %}
|
||||||
- name: yum-config-manager --enable rhel-server-rhscl-{{ grains['osmajorrelease'] }}-rpms
|
- enablerepo: {{ enable_php_repo }}
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
php_install_{{ state }}:
|
php_install_{{ state }}:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user