Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

sundries/virthost/base: fix a nummber of cases of a variable being used as a boot (now a warning)

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2019-05-18 00:00:15 +00:00
parent 39070b90d7
commit 984f012358
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
playbooks/groups/sundries.yml
View file

@ -26,11 +26,11 @@
- geoip - geoip
- geoip-city-wsgi/app - geoip-city-wsgi/app
- role: easyfix/gather - role: easyfix/gather
when: master_sundries_node when: master_sundries_node|bool
- role: regindexer/build - role: regindexer/build
when: master_sundries_node when: master_sundries_node|bool
- role: bz_review_report - role: bz_review_report
when: master_sundries_node and env != "staging" when: master_sundries_node|bool and env != "staging"
- rsyncd - rsyncd
- freemedia - freemedia
- sudo - sudo
@ -38,21 +38,21 @@
- { role: openvpn/client, - { role: openvpn/client,
when: env != "staging" } when: env != "staging" }
- role: review-stats/build - role: review-stats/build
when: master_sundries_node when: master_sundries_node|bool
- role: zanata - role: zanata
when: master_sundries_node when: master_sundries_node|bool
- role: fedora-web/build - role: fedora-web/build
when: master_sundries_node when: master_sundries_node|bool
- role: fedora-budget/build - role: fedora-budget/build
when: master_sundries_node when: master_sundries_node|bool
- role: fedora-docs/build - role: fedora-docs/build
when: master_sundries_node when: master_sundries_node|bool
- role: membership-map/build - role: membership-map/build
when: master_sundries_node when: master_sundries_node|bool
- role: developer/build - role: developer/build
when: master_sundries_node when: master_sundries_node|bool
- role: fedmsg/base - role: fedmsg/base
when: master_sundries_node when: master_sundries_node|bool
- role: nfs/client - role: nfs/client
mnt_dir: '/srv/docs' mnt_dir: '/srv/docs'
nfs_src_dir: 'openshift_{{ env_short }}_docs' nfs_src_dir: 'openshift_{{ env_short }}_docs'

2
playbooks/groups/virthost.yml
View file

@ -27,7 +27,7 @@
- collectd/base - collectd/base
- { role: iscsi_client, when: "inventory_hostname.startswith(('bvirthost', 'buildvmhost'))" } - { role: iscsi_client, when: "inventory_hostname.startswith(('bvirthost', 'buildvmhost'))" }
- sudo - sudo
- { role: openvpn/client, when: vpn } - { role: openvpn/client, when: vpn|bool }
- virthost - virthost
tasks: tasks:

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

@ -188,7 +188,7 @@
- iptables/iptables.{{ host_group }} - iptables/iptables.{{ host_group }}
- iptables/iptables.{{ env }} - iptables/iptables.{{ env }}
- iptables/iptables - iptables/iptables
when: baseiptables when: baseiptables|bool
notify: notify:
- restart iptables - restart iptables
- reload libvirtd - reload libvirtd
@ -204,7 +204,7 @@
- iptables - iptables
- service - service
- base - base
when: baseiptables when: baseiptables|bool
- name: ip6tables - name: ip6tables
template: src={{ item }} dest=/etc/sysconfig/ip6tables mode=0600 backup=yes template: src={{ item }} dest=/etc/sysconfig/ip6tables mode=0600 backup=yes
@ -214,7 +214,7 @@
- iptables/ip6tables.{{ host_group }} - iptables/ip6tables.{{ host_group }}
- iptables/ip6tables.{{ env }} - iptables/ip6tables.{{ env }}
- iptables/ip6tables - iptables/ip6tables
when: baseiptables when: baseiptables|bool
notify: notify:
- restart ip6tables - restart ip6tables
- reload libvirtd - reload libvirtd
@ -229,7 +229,7 @@
- ip6tables - ip6tables
- service - service
- base - base
when: baseiptables when: baseiptables|bool
- name: enable journald persistence - name: enable journald persistence
file: path=/var/log/journal state=directory file: path=/var/log/journal state=directory