diff options
| author | Scott Dodson <sdodson@redhat.com> | 2015-12-07 10:24:20 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2015-12-15 17:07:17 -0500 |
| commit | afe0064e01d3f6f33f323ffea7aae0eaf00b9ac2 (patch) | |
| tree | 1ab5236c3948197cb8976cac91305937f45bb727 /roles/openshift_node | |
| parent | 3f2be7d987ccef8c4e157163dd9394ba6492a88c (diff) | |
| download | openshift-afe0064e01d3f6f33f323ffea7aae0eaf00b9ac2.tar.gz openshift-afe0064e01d3f6f33f323ffea7aae0eaf00b9ac2.tar.bz2 openshift-afe0064e01d3f6f33f323ffea7aae0eaf00b9ac2.tar.xz openshift-afe0064e01d3f6f33f323ffea7aae0eaf00b9ac2.zip | |
Skip yum/dnf ops when is_containerized
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 13 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/storage_plugins/ceph.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/storage_plugins/glusterfs.yml | 1 |
3 files changed, 5 insertions, 12 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 597d5566f..11577dd8b 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -50,7 +50,7 @@ when: openshift.common.is_containerized | bool register: docker_images -- name: Pull required docker image +- name: Pull node image command: > docker pull {{ openshift.node.node_image }} when: openshift.common.is_containerized | bool and openshift.node.node_image not in docker_images.stdout @@ -61,17 +61,8 @@ src: openshift.docker.node.service register: install_node_result when: openshift.common.is_containerized | bool - -- name: Create openshift.common.data_dir - file: - path: openshift.common.data_dir - state: directory - mode: 0755 - owner: root - group: root - when: openshift.common.is_containerized | bool -- name: Pull required docker image +- name: Pull OpenvSwitch docker image command: > docker pull {{ openshift.node.ovs_image }} when: openshift.common.is_containerized | bool and openshift.node.ovs_image not in docker_images.stdout diff --git a/roles/openshift_node/tasks/storage_plugins/ceph.yml b/roles/openshift_node/tasks/storage_plugins/ceph.yml index 10d0990a0..119ad62ef 100644 --- a/roles/openshift_node/tasks/storage_plugins/ceph.yml +++ b/roles/openshift_node/tasks/storage_plugins/ceph.yml @@ -1,3 +1,4 @@ --- - name: Install Ceph storage plugin dependencies - action: "{{ ansible_pkg_mgr }} name=ceph-common state=present"
\ No newline at end of file + action: "{{ ansible_pkg_mgr }} name=ceph-common state=present" + when: not openshift.common.is_containerized | bool
\ No newline at end of file diff --git a/roles/openshift_node/tasks/storage_plugins/glusterfs.yml b/roles/openshift_node/tasks/storage_plugins/glusterfs.yml index 1080646ee..91ee77e7e 100644 --- a/roles/openshift_node/tasks/storage_plugins/glusterfs.yml +++ b/roles/openshift_node/tasks/storage_plugins/glusterfs.yml @@ -1,6 +1,7 @@ --- - name: Install GlusterFS storage plugin dependencies action: "{{ ansible_pkg_mgr }} name=glusterfs-fuse state=present" + when: not openshift.common.is_containerized | bool - name: Set sebooleans to allow gluster storage plugin access from containers seboolean: |