x/browbeat
Code Issues Proposed changes

WIP - Unvariablize variablized variables.

Browse Source 
Lets see if the CI job likes its variables unvariablized.

Change-Id: I63823b49d825fbae2c0a7a372c28182425ed1a5c
This commit is contained in:
akrzos 2016-09-08 13:49:21 -04:00
parent 39ae793fd9
commit 411f326457
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ansible/install/roles/browbeat/tasks/main.yml
View File

@ -196,7 +196,7 @@
- name: (shaker) Determine if TCP/{{shaker_port}} is already active
shell: firewall-cmd --list-ports | egrep -q "^{{shaker_port}}/tcp"
ignore_errors: true
register: firewalld_tcp{{shaker_port}}_exists
register: firewalld_shaker_port_exists
no_log: true
tags:
# Skip ANSIBLE0012 Commands should not change things if nothing needs doing
@ -207,7 +207,7 @@
shell: firewall-cmd --list-ports | egrep -q "^{{browbeat_results_port}}/tcp"
when: browbeat_results_in_httpd
ignore_errors: true
register: firewalld_tcp{{browbeat_results_port}}_exists
register: firewalld_browbeat_results_port_exists
no_log: true
tags:
# Skip ANSIBLE0012 Commands should not change things if nothing needs doing
@ -222,7 +222,7 @@
- firewall-cmd --reload
ignore_errors: true
become: true
when: firewalld_in_use.rc == 0 and firewalld_is_active.rc == 0 and firewalld_tcp{{shaker_port}}_exists.rc != 0
when: firewalld_in_use.rc == 0 and firewalld_is_active.rc == 0 and firewalld_shaker_port_exists.rc != 0
- name: (browbeat_results) Add firewall rule for TCP/{{browbeat_results_port}} (firewalld)
command: "{{ item }}"
@ -231,15 +231,15 @@
- firewall-cmd --reload
ignore_errors: true
become: true
when: browbeat_results_in_httpd and firewalld_in_use.rc == 0 and firewalld_is_active.rc == 0 and firewalld_tcp{{connmon_port}}_exists.rc != 0
when: browbeat_results_in_httpd and firewalld_in_use.rc == 0 and firewalld_is_active.rc == 0 and firewalld_browbeat_results_port_exists.rc != 0
# iptables-services
- name: (shaker) check firewall rules for TCP/{{shaker_port}} (iptables-services)
shell: grep "dport {{shaker_port}} \-j ACCEPT" /etc/sysconfig/iptables | wc -l
ignore_errors: true
become: true
register: iptables_tcp{{shaker_port}}_exists
failed_when: iptables_tcp{{shaker_port}}_exists == 127
register: iptables_shaker_port_exists
failed_when: iptables_shaker_port_exists == 127
no_log: true
tags:
# Skip ANSIBLE0012 Commands should not change things if nothing needs doing
@ -251,8 +251,8 @@
when: browbeat_results_in_httpd
ignore_errors: true
become: true
register: iptables_tcp{{browbeat_results_port}}_exists
failed_when: iptables_tcp{{browbeat_results_port}}_exists == 127
register: iptables_browbeat_results_port_exists
failed_when: iptables_browbeat_results_port_exists == 127
no_log: true
tags:
# Skip ANSIBLE0012 Commands should not change things if nothing needs doing
@ -267,7 +267,7 @@
insertbefore: '-A INPUT -i lo -j ACCEPT'
backup: yes
become: true
when: firewalld_in_use.rc != 0 and firewalld_is_active.rc != 0 and iptables_tcp{{shaker_port}}_exists.stdout|int == 0
when: firewalld_in_use.rc != 0 and firewalld_is_active.rc != 0 and iptables_shaker_port_exists.stdout|int == 0
register: iptables_needs_restart
- name: (browbeat_results) Add firewall rule for TCP/{{browbeat_results_port}} (iptables-services)
@ -278,7 +278,7 @@
insertbefore: '-A INPUT -i lo -j ACCEPT'
backup: yes
become: true
when: browbeat_results_in_httpd and firewalld_in_use.rc != 0 and firewalld_is_active.rc != 0 and iptables_tcp{{browbeat_results_port}}_exists.stdout|int == 0
when: browbeat_results_in_httpd and firewalld_in_use.rc != 0 and firewalld_is_active.rc != 0 and iptables_browbeat_results_port_exists.stdout|int == 0
register: iptables_needs_restart
- name: Restart iptables-services (iptables-services)