diff --git a/files/etc/nodepool/elements/README b/files/etc/nodepool/elements/README deleted file mode 100644 index 092bf7c..0000000 --- a/files/etc/nodepool/elements/README +++ /dev/null @@ -1,6 +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 diskimage-builder elements to be used by -# nodepool-builder. diff --git a/tasks/config.yaml b/tasks/config.yaml index 0806ca6..2f06ab5 100644 --- a/tasks/config.yaml +++ b/tasks/config.yaml @@ -83,13 +83,3 @@ owner: "{{nodepool_file_launcher_logging_conf_owner }}" src: "{{ nodepool_file_launcher_logging_conf_src }}" register: nodepool_file_launcher_logging_conf - -- name: Install nodepool elements directory. - become: yes - copy: - dest: "{{ nodepool_file_nodepool_elements_dest }}" - group: "{{ nodepool_file_nodepool_elements_group }}" - mode: "{{ nodepool_file_nodepool_elements_mode }}" - owner: "{{nodepool_file_nodepool_elements_owner }}" - src: "{{ nodepool_file_nodepool_elements_src }}" - register: nodepool_file_nodepool_elements diff --git a/templates/etc/nodepool/nodepool.yaml b/templates/etc/nodepool/nodepool.yaml index 2aad130..4a2c83c 100644 --- a/templates/etc/nodepool/nodepool.yaml +++ b/templates/etc/nodepool/nodepool.yaml @@ -1,7 +1,6 @@ # This file is generated by Ansible # DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN # -elements-dir: /etc/nodepool/elements images-dir: /opt/nodepool/images zookeeper-servers: diff --git a/tests/test.yaml b/tests/test.yaml index 818a97d..c6a58a3 100644 --- a/tests/test.yaml +++ b/tests/test.yaml @@ -36,7 +36,6 @@ - nodepool_file_builder_logging_conf - nodepool_file_deleter_logging_conf - nodepool_file_launcher_logging_conf - - nodepool_file_nodepool_elements - nodepool_file_nodepool_service - nodepool_file_nodepool_service_config - nodepool_file_nodepool_builder_service @@ -166,20 +165,6 @@ - secure_conf_stat.stat.gr_name == 'nodepool' - secure_conf_stat.stat.mode == '0600' - - name: Register nodepool_elements_dir_dest_stat. - stat: - path: /etc/nodepool/elements - register: nodepool_elements_dir_dest_stat - - - name: Assert nodepool_elements_dir_dest tests. - assert: - that: - - nodepool_elements_dir_dest_stat.stat.exists - - nodepool_elements_dir_dest_stat.stat.isdir - - nodepool_elements_dir_dest_stat.stat.pw_name == 'nodepool' - - nodepool_elements_dir_dest_stat.stat.gr_name == 'nodepool' - - nodepool_elements_dir_dest_stat.stat.mode == '0755' - - name: Register nodepool_user_home_stat. stat: path: /var/lib/nodepool