Infrastructure/ansible
5
0
Fork 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

fix deprecated |success to is success

Browse source
This commit is contained in:
Kevin Fenzi 2018-04-04 19:24:21 +00:00
parent 0353f1f6a2
commit 9fe41eca70
7 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/host_update.yml
View file

@ -29,4 +29,4 @@
- name: run rkhunter --propupd - name: run rkhunter --propupd
command: /usr/bin/rkhunter --propupd command: /usr/bin/rkhunter --propupd
when: rkhunter|success when: rkhunter is success

7
playbooks/rkhunter_only.yml
View file

@ -12,9 +12,4 @@
- name: run rkhunter --propupd - name: run rkhunter --propupd
command: /usr/bin/rkhunter --propupd command: /usr/bin/rkhunter --propupd
when: rkhunter|success when: rkhunter is success

7
playbooks/rkhunter_update.yml
View file

@ -20,9 +20,4 @@
- name: run rkhunter --propupd - name: run rkhunter --propupd
command: /usr/bin/rkhunter --propupd command: /usr/bin/rkhunter --propupd
when: rkhunter|success when: rkhunter is success

2
playbooks/vhost_update.yml
View file

@ -70,4 +70,4 @@
- name: run rkhunter --propupd - name: run rkhunter --propupd
command: /usr/bin/rkhunter --propupd command: /usr/bin/rkhunter --propupd
when: rkhunter|success when: rkhunter is success

6
roles/base/tasks/main.yml
View file

@ -54,7 +54,7 @@
ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none
notify: notify:
- restart NetworkManager - restart NetworkManager
when: ansible_distribution_major_version|int >=7 and nmclitest|success and ( not ansible_ifcfg_blacklist) and not nm_controlled_resolv when: ansible_distribution_major_version|int >=7 and nmclitest is success and ( not ansible_ifcfg_blacklist) and not nm_controlled_resolv
tags: tags:
- config - config
- resolvconf - resolvconf
@ -67,7 +67,7 @@
changed_when: false changed_when: false
failed_when: 'if_uuid.stdout == ""' failed_when: 'if_uuid.stdout == ""'
check_mode: no check_mode: no
when: ansible_distribution_major_version|int >=7 and nmclitest|success and ( not ansible_ifcfg_blacklist ) when: ansible_distribution_major_version|int >=7 and nmclitest is success and ( not ansible_ifcfg_blacklist )
tags: tags:
- config - config
- ifcfg - ifcfg
@ -81,7 +81,7 @@
# - restart NetworkManager # - restart NetworkManager
- reload NetworkManager-connections - reload NetworkManager-connections
- apply interface-changes - apply interface-changes
when: (virthost is not defined) and (item.startswith(('eth','br','enc'))) and (hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['type'] == 'ether') and (ansible_distribution_major_version|int >=7) and hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active'] and nmclitest|success and ( not ansible_ifcfg_blacklist ) and ( ansible_ifcfg_whitelist is not defined or item in ansible_ifcfg_whitelist ) when: (virthost is not defined) and (item.startswith(('eth','br','enc'))) and (hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['type'] == 'ether') and (ansible_distribution_major_version|int >=7) and hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active'] and nmclitest is success and ( not ansible_ifcfg_blacklist ) and ( ansible_ifcfg_whitelist is not defined or item in ansible_ifcfg_whitelist )
tags: tags:
- config - config
- ifcfg - ifcfg

2
roles/beaker/server/tasks/main.yml
View file

@ -100,7 +100,7 @@
- name: initialize beaker database - name: initialize beaker database
command: "beaker-init -u {{beaker_server_admin_user}} -p {{beaker_server_admin_pass}} -e {{beaker_server_email}}" command: "beaker-init -u {{beaker_server_admin_user}} -p {{beaker_server_admin_pass}} -e {{beaker_server_email}}"
when: setup_beaker_conf|success when: setup_beaker_conf is success
tags: tags:
- beaker-init - beaker-init
- beaker-server - beaker-server

2
roles/nginx/tasks/ssl-setup.yml
View file

@ -22,7 +22,7 @@
- "{{ httpd_ssl_crt_file }}" - "{{ httpd_ssl_crt_file }}"
skip: True skip: True
register: setup_ssl_pem register: setup_ssl_pem
when: setup_ssl_key|success when: setup_ssl_key is success
tags: tags:
- update_ssl_certs - update_ssl_certs