infrastructure/ansible
2
0
Fork 0
Code Pull requests 7 Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Stephen Smoogen 2017-08-22 22:51:59 +00:00
commit 28b4ff6ee8
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/groups/os-cluster.yml
View file

@ -21,7 +21,7 @@
- rsyncd - rsyncd
- sudo - sudo
- { role: openvpn/client, - { role: openvpn/client,
when: env != "staging" } when: env != "staging" and 'os-control' not in group_names }
tasks: tasks:
- name: put openshift 3.4 repo on os- systems - name: put openshift 3.4 repo on os- systems

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

@ -6,6 +6,7 @@
with_items: with_items:
- openvpn - openvpn
tags: tags:
- openvpn
- packages - packages
when: ansible_distribution_major_version|int < 8 when: ansible_distribution_major_version|int < 8
@ -14,6 +15,7 @@
with_items: with_items:
- openvpn - openvpn
tags: tags:
- openvpn
- packages - packages
when: ansible_distribution_major_version|int > 7 and ansible_cmdline.ostree is not defined when: ansible_distribution_major_version|int > 7 and ansible_cmdline.ostree is not defined