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 /roles | |
| 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 'roles')
| -rw-r--r-- | roles/cockpit/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/fluentd_master/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/fluentd_node/tasks/main.yml | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/roles/cockpit/tasks/main.yml b/roles/cockpit/tasks/main.yml index 6e9f3a8bd..e83f72a3d 100644 --- a/roles/cockpit/tasks/main.yml +++ b/roles/cockpit/tasks/main.yml @@ -6,7 +6,7 @@ - cockpit-shell - cockpit-bridge - "{{ cockpit_plugins }}" - when: not openshift.common.is_containerized | bool + when: not openshift.common.is_atomic | bool - name: Enable cockpit-ws service: diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml index 1c87d562a..32f972f0a 100644 --- a/roles/fluentd_master/tasks/main.yml +++ b/roles/fluentd_master/tasks/main.yml @@ -1,12 +1,12 @@ --- - fail: msg: "fluentd master is not yet supported on atomic hosts" - when: openshift.common.is_containerized | bool + when: openshift.common.is_atomic | bool # TODO: Update fluentd install and configuration when packaging is complete - name: download and install td-agent action: "{{ ansible_pkg_mgr }} name='http://packages.treasuredata.com/2/redhat/7/x86_64/td-agent-2.2.0-0.x86_64.rpm' state=present" - when: not openshift.common.is_containerized | bool + when: not openshift.common.is_atomic | bool - name: Verify fluentd plugin installed command: '/opt/td-agent/embedded/bin/gem query -i fluent-plugin-kubernetes' diff --git a/roles/fluentd_node/tasks/main.yml b/roles/fluentd_node/tasks/main.yml index 8d34c0b19..9fd908687 100644 --- a/roles/fluentd_node/tasks/main.yml +++ b/roles/fluentd_node/tasks/main.yml @@ -1,12 +1,12 @@ --- - fail: msg: "fluentd node is not yet supported on atomic hosts" - when: openshift.common.is_containerized | bool + when: openshift.common.is_atomic | bool # TODO: Update fluentd install and configuration when packaging is complete - name: download and install td-agent action: "{{ ansible_pkg_mgr }} name='http://packages.treasuredata.com/2/redhat/7/x86_64/td-agent-2.2.0-0.x86_64.rpm' state=present" - when: not openshift.common.is_containerized | bool + when: not openshift.common.is_atomic | bool - name: Verify fluentd plugin installed command: '/opt/td-agent/embedded/bin/gem query -i fluent-plugin-kubernetes' @@ -55,4 +55,3 @@ name: 'td-agent' state: started enabled: yes - |