diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-17 10:43:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 10:43:16 -0400 |
| commit | 844137e9e968fb0455b9cf5128342c3e449c8abb (patch) | |
| tree | 070f227571aaeaf9d3b93d5dd13ed7842f697762 /roles | |
| parent | 94af651106711912a7bce866517af088f4d1d0bf (diff) | |
| parent | 12b17e1af352748d00d8ba2cf3b99a623ec61641 (diff) | |
| download | openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.tar.gz openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.tar.bz2 openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.tar.xz openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.zip | |
Merge pull request #2608 from abutcher/template-with-items
Template with_items for upstream ansible-2.2 compat.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/kube_nfs_volumes/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/kube_nfs_volumes/tasks/nfs.yml | 2 | ||||
| -rw-r--r-- | roles/nickhammond.logrotate/tasks/main.yml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/roles/kube_nfs_volumes/tasks/main.yml b/roles/kube_nfs_volumes/tasks/main.yml index 5432a5e2f..5eff30f6f 100644 --- a/roles/kube_nfs_volumes/tasks/main.yml +++ b/roles/kube_nfs_volumes/tasks/main.yml @@ -12,11 +12,11 @@ - name: create filesystem filesystem: fstype=ext4 dev=/dev/{{ item.name }} - with_items: partition_pool + with_items: "{{ partition_pool }}" - name: mount mount: name={{mount_dir}}/{{ item.name }} src=/dev/{{ item.name }} state=mounted fstype=ext4 passno=2 - with_items: partition_pool + with_items: "{{ partition_pool }}" - include: nfs.yml @@ -28,4 +28,4 @@ body_format: json status_code: 201 HEADER_Authorization: "Bearer {{ kubernetes_token }}" - with_items: partition_pool + with_items: "{{ partition_pool }}" diff --git a/roles/kube_nfs_volumes/tasks/nfs.yml b/roles/kube_nfs_volumes/tasks/nfs.yml index 9a68ceb8d..474ec69e5 100644 --- a/roles/kube_nfs_volumes/tasks/nfs.yml +++ b/roles/kube_nfs_volumes/tasks/nfs.yml @@ -13,5 +13,5 @@ lineinfile: dest=/etc/exports regexp="^{{ mount_dir }}/{{ item.name }} " line="{{ mount_dir }}/{{ item.name }} {{nfs_export_options}}" - with_items: partition_pool + with_items: "{{ partition_pool }}" notify: restart nfs diff --git a/roles/nickhammond.logrotate/tasks/main.yml b/roles/nickhammond.logrotate/tasks/main.yml index e2c51a903..1979c851f 100644 --- a/roles/nickhammond.logrotate/tasks/main.yml +++ b/roles/nickhammond.logrotate/tasks/main.yml @@ -7,5 +7,5 @@ template: src: logrotate.d.j2 dest: /etc/logrotate.d/{{ item.name }} - with_items: logrotate_scripts + with_items: "{{ logrotate_scripts | default([]) }}" when: logrotate_scripts is defined |