diff options
| author | Stephen Smoogen <smooge@redhat.com> | 2017-08-22 22:51:59 +0000 |
|---|---|---|
| committer | Stephen Smoogen <smooge@redhat.com> | 2017-08-22 22:51:59 +0000 |
| commit | 28b4ff6ee871776d95bc4b7b8f7ab423c17d7dc2 (patch) | |
| tree | 6596dbcd74e515c9ae2728ce89dd25b6ced9f514 | |
| parent | 70cd9d00563f9ae85b4371e88cb5dd0fd90c3c0e (diff) | |
| parent | c811a481b9cebd087f27231cd7901de76ed2c574 (diff) | |
| download | ansible-28b4ff6ee871776d95bc4b7b8f7ab423c17d7dc2.tar.gz ansible-28b4ff6ee871776d95bc4b7b8f7ab423c17d7dc2.tar.xz ansible-28b4ff6ee871776d95bc4b7b8f7ab423c17d7dc2.zip | |
Merge branch 'master' of /git/ansible
| -rw-r--r-- | playbooks/groups/os-cluster.yml | 2 | ||||
| -rw-r--r-- | roles/openvpn/base/tasks/main.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index ab7d9dc48..9dc2634d2 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -21,7 +21,7 @@ - rsyncd - sudo - { role: openvpn/client, - when: env != "staging" } + when: env != "staging" and 'os-control' not in group_names } tasks: - name: put openshift 3.4 repo on os- systems diff --git a/roles/openvpn/base/tasks/main.yml b/roles/openvpn/base/tasks/main.yml index a5f52843e..0352db7bb 100644 --- a/roles/openvpn/base/tasks/main.yml +++ b/roles/openvpn/base/tasks/main.yml @@ -6,6 +6,7 @@ with_items: - openvpn tags: + - openvpn - packages when: ansible_distribution_major_version|int < 8 @@ -14,6 +15,7 @@ with_items: - openvpn tags: + - openvpn - packages when: ansible_distribution_major_version|int > 7 and ansible_cmdline.ostree is not defined |