diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-26 12:50:48 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-26 12:50:48 -0500 |
| commit | 4609a2a74f071ac53bbd1c052bbc75dc44ba8e44 (patch) | |
| tree | fc1d4db94eb71d34649a8e430de25484c0ef0bb5 /playbooks/common | |
| parent | ba5c5a2692822e9752ff5a0f67b6c085056d7674 (diff) | |
| parent | d0f5faef5393affed75d5fb00fc98f3e3b705077 (diff) | |
| download | openshift-4609a2a74f071ac53bbd1c052bbc75dc44ba8e44.tar.gz openshift-4609a2a74f071ac53bbd1c052bbc75dc44ba8e44.tar.bz2 openshift-4609a2a74f071ac53bbd1c052bbc75dc44ba8e44.tar.xz openshift-4609a2a74f071ac53bbd1c052bbc75dc44ba8e44.zip | |
Merge pull request #1279 from abutcher/is-atomic-swap
Install cockpit, logrotate and fluentd unless host is atomic.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-etcd/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-etcd/config.yml b/playbooks/common/openshift-etcd/config.yml index 9a5ae0e6b..9473340a1 100644 --- a/playbooks/common/openshift-etcd/config.yml +++ b/playbooks/common/openshift-etcd/config.yml @@ -89,7 +89,7 @@ roles: - etcd - role: nickhammond.logrotate - when: not openshift.common.is_containerized | bool + when: not openshift.common.is_atomic | bool - name: Delete temporary directory on localhost hosts: localhost diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 70e6ce0b4..cb885d80a 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -338,7 +338,7 @@ roles: - openshift_master - role: nickhammond.logrotate - when: not openshift.common.is_containerized | bool + when: not openshift.common.is_atomic | bool - role: fluentd_master when: openshift.common.use_fluentd | bool - role: nuage_master diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 3e7bca34e..975bfe7b4 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -214,7 +214,7 @@ - role: nuage_node when: openshift.common.use_nuage | bool - role: nickhammond.logrotate - when: not openshift.common.is_containerized | bool + when: not openshift.common.is_atomic | bool - role: fluentd_node when: openshift.common.use_fluentd | bool tasks: |