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

try and handle cases for f24 not being updated to the new setup either

Browse source
This commit is contained in:
Kevin Fenzi 2017-05-14 23:26:45 +00:00
parent f381865238
commit 52318bbc49
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@
- packages
when: ansible_distribution_major_version|int > 7 and ansible_cmdline.ostree is not defined
- name: Install certificate and key (rhel6)
- name: Install certificate and key (rhel6 and fedora24 and older)
copy: src={{ private }}/files/vpn/openvpn/keys/ca.crt
dest=/etc/openvpn/ca.crt
owner=root group=root mode=0600
@ -28,7 +28,7 @@
#- restart openvpn (Fedora)
#- restart openvpn (RHEL7)
#- restart openvpn (RHEL6)
when: ansible_distribution_major_version|int < 7
when: ansible_distribution_major_version|int < 25
- name: Install certificate and key (rhel7 or fedora) for client
copy: src={{ private }}/files/vpn/openvpn/keys/ca.crt
@ -54,7 +54,7 @@
#- restart openvpn (Fedora)
#- restart openvpn (RHEL7)
#- restart openvpn (RHEL6)
when: ansible_distribution_major_version|int > 6 and ansible_cmdline.ostree is not defined
when: inventory_hostname.startswith('bastion0')
- name: install fix-routes.sh script
copy: src=fix-routes.sh

4
roles/openvpn/client/tasks/main.yml
View file

@ -40,7 +40,7 @@
# - restart openvpn (Fedora)
# - restart openvpn (RHEL7)
# - restart openvpn (RHEL6)
when: ansible_distribution_major_version|int > 6 and ansible_cmdline.ostree is not defined
when: ( ansible_distribution_major_version|int != 6 or ansible_distribution_major_version|int != 24) and ansible_cmdline.ostree is not defined
- name: Install configuration files (rhel6)
copy: src={{ item.file }}
@ -63,7 +63,7 @@
# - restart openvpn (Fedora)
# - restart openvpn (RHEL7)
# - restart openvpn (RHEL6)
when: ansible_distribution_major_version|int < 7 and ansible_cmdline.ostree is not defined
when: ( ansible_distribution_major_version|int == 6 or ansible_distribution_major_version|int == 24) and ansible_cmdline.ostree is not defined
- name: enable openvpn service for rhel 6
service: name=openvpn state=started enabled=true