Cicalese has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284531
Change subject: changed RHEL value in conditionals
......................................................................
changed RHEL value in conditionals
Change-Id: Ie19409517286fd9785a4f4087817d6e7cafca95a
---
M roles/deploy_mw_host/tasks/configure_squid.yml
M roles/deploy_mw_host/templates/wikifarm.conf.j2
M roles/setup/tasks/main.yml
3 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/ansible-wikifarm
refs/changes/31/284531/1
diff --git a/roles/deploy_mw_host/tasks/configure_squid.yml
b/roles/deploy_mw_host/tasks/configure_squid.yml
index 48a4489..c7ad29d 100644
--- a/roles/deploy_mw_host/tasks/configure_squid.yml
+++ b/roles/deploy_mw_host/tasks/configure_squid.yml
@@ -23,14 +23,14 @@
src=squid.conf-el6.j2
dest=/etc/squid/squid.conf
backup=yes
- when: SQUID_HOSTNAME is defined and (ansible_distribution == 'CentOS' or
ansible_distribution == 'Red Hat Enterprise Linux') and
ansible_distribution_major_version == '6'
+ when: SQUID_HOSTNAME is defined and (ansible_distribution == 'CentOS' or
ansible_distribution == 'RedHat') and ansible_distribution_major_version == '6'
- name: edit Squid configuration file
template:
src=squid.conf-el7.j2
dest=/etc/squid/squid.conf
backup=yes
- when: SQUID_HOSTNAME is defined and (ansible_distribution == 'CentOS' or
ansible_distribution == 'Red Hat Enterprise Linux') and
ansible_distribution_major_version == '7'
+ when: SQUID_HOSTNAME is defined and (ansible_distribution == 'CentOS' or
ansible_distribution == 'RedHat') and ansible_distribution_major_version == '7'
- name: configure Squid to start at boot
service:
diff --git a/roles/deploy_mw_host/templates/wikifarm.conf.j2
b/roles/deploy_mw_host/templates/wikifarm.conf.j2
index cdb0e0b..65b82e2 100644
--- a/roles/deploy_mw_host/templates/wikifarm.conf.j2
+++ b/roles/deploy_mw_host/templates/wikifarm.conf.j2
@@ -21,11 +21,11 @@
Include {{ APACHE_CONF_DIRECTORY }}/optional.conf
Include {{ APACHE_CONF_DIRECTORY }}/http_redirect.conf
-{% if (ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux') and ansible_distribution_major_version == '6' %}
+{% if (ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat')
and ansible_distribution_major_version == '6' %}
Include {{ APACHE_INSTANCE_DIRECTORY }}/*.conf
-{% elif (ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux') and ansible_distribution_major_version == '7' %}
+{% elif (ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat')
and ansible_distribution_major_version == '7' %}
IncludeOptional {{ APACHE_INSTANCE_DIRECTORY }}/*.conf
diff --git a/roles/setup/tasks/main.yml b/roles/setup/tasks/main.yml
index 792c458..4f3b41c 100644
--- a/roles/setup/tasks/main.yml
+++ b/roles/setup/tasks/main.yml
@@ -8,54 +8,54 @@
yum:
name=iptables-services
state=latest
- when: (ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux') and ansible_distribution_major_version == '7'
+ when: (ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat')
and ansible_distribution_major_version == '7'
- name: install iptables if CentOS/RHEL 7 (2/3)
shell: systemctl enable iptables
- when: (ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux') and ansible_distribution_major_version == '7'
+ when: (ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat')
and ansible_distribution_major_version == '7'
- name: install iptables if CentOS/RHEL 7 (3/3)
shell: systemctl start iptables
- when: (ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux') and ansible_distribution_major_version == '7'
+ when: (ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat')
and ansible_distribution_major_version == '7'
- name: add MySQL repo (1/2)
get_url:
url=http://repo.mysql.com/mysql-community-release-el{{
ansible_distribution_major_version }}.rpm
dest=/root/mysql-community-release-el{{ ansible_distribution_major_version
}}.rpm
validate_certs={{ VALIDATE_CERTS }}
- when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux'
+ when: ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat'
- name: add MySQL repo (2/2)
shell: rpm -Uvh mysql-community-release-el{{
ansible_distribution_major_version }}.rpm
args:
chdir: /root
ignore_errors: true
- when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux'
+ when: ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat'
- name: add epel repo (1/2)
get_url:
url=https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{
ansible_distribution_major_version }}.noarch.rpm
dest=/root/epel-release-latest-{{ ansible_distribution_major_version
}}.noarch.rpm
validate_certs={{ VALIDATE_CERTS }}
- when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux'
+ when: ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat'
- name: add epel repo (2/2)
shell: rpm -Uvh epel-release-latest-{{ ansible_distribution_major_version
}}.noarch.rpm
args:
chdir: /root
ignore_errors: true
- when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux'
+ when: ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat'
- name: get remi repo
get_url:
url=http://rpms.remirepo.net/enterprise/remi.repo
dest=/etc/yum.repos.d
validate_certs={{ VALIDATE_CERTS }}
- when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux'
+ when: ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat'
- name: enable remi repo
shell: yum-config-manager --enable remi-php55
- when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat
Enterprise Linux'
+ when: ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat'
- name: copy public key
authorized_key:
--
To view, visit https://gerrit.wikimedia.org/r/284531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie19409517286fd9785a4f4087817d6e7cafca95a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/ansible-wikifarm
Gerrit-Branch: master
Gerrit-Owner: Cicalese <cical...@mitre.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
