summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-04 17:39:34 -0500
committerGitHub <noreply@github.com>2017-01-04 17:39:34 -0500
commit71ae12fc775d4606a66959eb45def687ba716a28 (patch)
treea4cf8cf32da423887b90d33d146d37459a4d2f43 /roles
parentc595be4c25837da51ca38dcc60b4eb5e36beeff9 (diff)
parentb5bc26c1822b206c3f66ef77fe83e5ac1bd969de (diff)
downloadopenshift-71ae12fc775d4606a66959eb45def687ba716a28.tar.gz
openshift-71ae12fc775d4606a66959eb45def687ba716a28.tar.bz2
openshift-71ae12fc775d4606a66959eb45def687ba716a28.tar.xz
openshift-71ae12fc775d4606a66959eb45def687ba716a28.zip
Merge pull request #3040 from sdodson/issue3025
Enable repos defined in openshift_additional_repos by default
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_repos/templates/yum_repo.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_repos/templates/yum_repo.j2 b/roles/openshift_repos/templates/yum_repo.j2
index 2d9243545..0ec0045eb 100644
--- a/roles/openshift_repos/templates/yum_repo.j2
+++ b/roles/openshift_repos/templates/yum_repo.j2
@@ -2,9 +2,9 @@
[{{ repo.id }}]
name={{ repo.name | default(repo.id) }}
baseurl={{ repo.baseurl }}
-{% set enable_repo = repo.enabled | default('1') %}
+{% set enable_repo = repo.enabled | default(1,True) %}
enabled={{ 1 if ( enable_repo == 1 or enable_repo == True ) else 0 }}
-{% set enable_gpg_check = repo.gpgcheck | default('1') %}
+{% set enable_gpg_check = repo.gpgcheck | default(1,True) %}
gpgcheck={{ 1 if ( enable_gpg_check == 1 or enable_gpg_check == True ) else 0 }}
{% for key, value in repo.iteritems() %}
{% if key not in ['id', 'name', 'baseurl', 'enabled', 'gpgcheck'] and value is defined %}