windmill
/
ansible-role-nodepool
Code Issues Proposed changes

Preserve existing permissions with rsync 

Otherwise, we loose the execute bits for dib elements.

Change-Id: I83e193cd9aef7e7e9da71558b27af1463c80bc3b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-11-27 17:50:15 -05:00
parent c6663bfe73
commit c694057024
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasks/config.yaml
View File

@ -71,7 +71,7 @@
- name: Create nodepool project config directory.
file:
group: "{{ ansible_ssh_user }}"
mode: 0755
mode: 0775
owner: "{{ ansible_ssh_user }}"
path: "{{ item }}"
state: directory
@ -82,8 +82,8 @@
sudo: no
synchronize:
dest: "{{ nodepool_project_config_dir_dest }}"
src: "{{ nodepool_project_config_dir }}"
perms: yes
rsync_opts:
- '--chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r'
- '--delete'
src: "{{ nodepool_project_config_dir }}"
when: nodepool_project_config_dir != ""

2
tests/test.yaml
View File

@ -56,7 +56,7 @@
# openstack-infra jenkins user in nodepool.
- nodepool_project_config_dir_dest_stat.stat.pw_name == 'jenkins'
- nodepool_project_config_dir_dest_stat.stat.gr_name == 'jenkins'
- nodepool_project_config_dir_dest_stat.stat.mode == '0755'
- nodepool_project_config_dir_dest_stat.stat.mode == '0775'
- name: Ensure /etc/nodepool/config is empty.
shell: "ls -1 /etc/nodepool/config | wc -l"