Drop synchronize support for scripts

It was become too much work to deal with this. Additionally, if people
want to manually synchronize we expose the proper settings to allow
them to do so.

Change-Id: I68aedb16223146f1ff6d7c9115773e62ae4ba8c9
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

README.rst

@@ -49,10 +49,6 @@ Role Variables
     # Default: /var/lib/nodepool
     nodepool_user_home: /var/lib/nodepool
 
-    # Path to folder containing scripts used by nodepool.
-    # Default: ""
-    nodepool_scripts_dir: ""
-
 Dependencies
 ------------
 

defaults/main.yaml

@@ -30,6 +30,12 @@ nodepool_file_nodepool_elements_mode: 0755
 nodepool_file_nodepool_elements_owner: "{{ nodepool_user_name }}"
 nodepool_file_nodepool_elements_src: etc/nodepool/elements/
 
+nodepool_file_nodepool_scripts_dest: /etc/nodepool/scripts
+nodepool_file_nodepool_scripts_group: "{{ nodepool_user_group }}"
+nodepool_file_nodepool_scripts_mode: 0755
+nodepool_file_nodepool_scripts_owner: "{{ nodepool_user_name }}"
+nodepool_file_nodepool_scripts_src: etc/nodepool/scripts/
+
 nodepool_file_nodepool_yaml_dest: /etc/nodepool/nodepool.yaml
 nodepool_file_nodepool_yaml_group: "{{ nodepool_user_group }}"
 nodepool_file_nodepool_yaml_mode: 0644
@@ -42,12 +48,8 @@ nodepool_file_secure_conf_mode: 0600
 nodepool_file_secure_conf_owner: "{{ nodepool_user_name }}"
 nodepool_file_secure_conf_src: etc/nodepool/secure.conf
 
-nodepool_scripts_dir: ""
-nodepool_scripts_dir_dest: /etc/nodepool/scripts
-
 nodepool_config_images_dir: /opt/nodepool/images
 nodepool_config_log_config: /etc/nodepool/logging.conf
-nodepool_config_scripts_dir: "{{ nodepool_scripts_dir_dest }}"
 
 nodepool_file_logging_conf: etc/nodepool/logging.conf
 

tasks/config.yaml

@@ -60,21 +60,9 @@
 
 - name: Create nodepool scripts directory.
   become: yes
-  file:
-    group: "{{ ansible_user }}"
-    mode: 0775
-    owner: "{{ ansible_user }}"
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ nodepool_scripts_dir_dest }}"
-
-- name: Rsync nodepool scripts directory.
-  become: no
-  synchronize:
-    dest: "{{ nodepool_scripts_dir_dest }}"
-    perms: yes
-    rsync_opts:
-      - '--delete'
-    src: "{{ nodepool_scripts_dir }}"
-  when: nodepool_scripts_dir != ""
+  copy:
+    dest: "{{ nodepool_file_nodepool_scripts_dest }}"
+    group: "{{ nodepool_file_nodepool_scripts_group }}"
+    mode: "{{ nodepool_file_nodepool_scripts_mode }}"
+    owner: "{{nodepool_file_nodepool_scripts_owner }}"
+    src: "{{ nodepool_file_nodepool_scripts_src }}"

tests/test.yaml

@@ -97,17 +97,9 @@
         that:
           - nodepool_scripts_dir_dest_stat.stat.exists
           - nodepool_scripts_dir_dest_stat.stat.isdir
-            # NOTE(pabelanger): This means we are hardcoded to the
-            # openstack-infra jenkins user in nodepool.
-          - nodepool_scripts_dir_dest_stat.stat.pw_name == 'jenkins'
-          - nodepool_scripts_dir_dest_stat.stat.gr_name == 'jenkins'
-          - nodepool_scripts_dir_dest_stat.stat.mode == '0775'
-
-    - name: Ensure /etc/nodepool/scripts is empty.
-      shell: "ls -1 /etc/nodepool/scripts | wc -l"
-      register: result
-      failed_when: result.stdout != "0"
-      tags: skip_ansible_lint
+          - nodepool_scripts_dir_dest_stat.stat.pw_name == 'nodepool'
+          - nodepool_scripts_dir_dest_stat.stat.gr_name == 'nodepool'
+          - nodepool_scripts_dir_dest_stat.stat.mode == '0755'
 
     - name: Register nodepool_user_home_stat.
       stat: