diff --git a/defaults/main.yaml b/defaults/main.yaml index cf1625c..743e51d 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -30,12 +30,6 @@ 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 diff --git a/files/etc/nodepool/scripts/README b/files/etc/nodepool/scripts/README deleted file mode 100644 index d3a9a52..0000000 --- a/files/etc/nodepool/scripts/README +++ /dev/null @@ -1,5 +0,0 @@ -# This file is generated by Ansible -# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN -# - -# This folder is where you place your scripts to be used by nodepool. diff --git a/tasks/config.yaml b/tasks/config.yaml index 36fa8d5..0806ca6 100644 --- a/tasks/config.yaml +++ b/tasks/config.yaml @@ -93,13 +93,3 @@ owner: "{{nodepool_file_nodepool_elements_owner }}" src: "{{ nodepool_file_nodepool_elements_src }}" register: nodepool_file_nodepool_elements - -- name: Create nodepool scripts directory. - become: yes - 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 }}" - register: nodepool_file_nodepool_scripts diff --git a/templates/etc/nodepool/nodepool.yaml b/templates/etc/nodepool/nodepool.yaml index 409fc31..2aad130 100644 --- a/templates/etc/nodepool/nodepool.yaml +++ b/templates/etc/nodepool/nodepool.yaml @@ -3,7 +3,6 @@ # elements-dir: /etc/nodepool/elements images-dir: /opt/nodepool/images -script-dir: /etc/nodepool/scripts zookeeper-servers: - host: localhost diff --git a/tests/test.yaml b/tests/test.yaml index b460aca..818a97d 100644 --- a/tests/test.yaml +++ b/tests/test.yaml @@ -37,7 +37,6 @@ - nodepool_file_deleter_logging_conf - nodepool_file_launcher_logging_conf - nodepool_file_nodepool_elements - - nodepool_file_nodepool_scripts - nodepool_file_nodepool_service - nodepool_file_nodepool_service_config - nodepool_file_nodepool_builder_service @@ -181,20 +180,6 @@ - nodepool_elements_dir_dest_stat.stat.gr_name == 'nodepool' - nodepool_elements_dir_dest_stat.stat.mode == '0755' - - name: Register nodepool_scripts_dir_dest_stat. - stat: - path: /etc/nodepool/scripts - register: nodepool_scripts_dir_dest_stat - - - name: Assert nodepool_scripts_dir_dest tests. - assert: - that: - - nodepool_scripts_dir_dest_stat.stat.exists - - nodepool_scripts_dir_dest_stat.stat.isdir - - 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: path: /var/lib/nodepool