From 324ebd84af8d0a330c25b50c5542c03c212e673d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Rosada?= Date: Mon, 25 Mar 2019 08:15:05 +0100 Subject: [PATCH] Add enablerepo option to php-salt-formula --- php/ng/installed.jinja | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/php/ng/installed.jinja b/php/ng/installed.jinja index 5dd4749..fb778ef 100644 --- a/php/ng/installed.jinja +++ b/php/ng/installed.jinja @@ -75,15 +75,15 @@ php_ppa_{{ state }}: {% 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 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' %} php_centos_scl_enable_{{ state }}: pkg.installed: - - name: centos-release-scl - {% elif use_scl_repo and grains['os'] == 'RedHat' %} -php_redhat_scl_enable_{{ state }}: - cmd.run: - - name: yum-config-manager --enable rhel-server-rhscl-{{ grains['osmajorrelease'] }}-rpms - {% endif %} + pkg.installed: + - name: {{ state }} + - pkgs: {{ pkgs|json() }} +{% if enable_php_repo %} + - enablerepo: {{ enable_php_repo }} {% endif %} php_install_{{ state }}: