windmill
/
ansible-role-nodepool
Code Issues Proposed changes

More elements and scripts to /etc/nodepool 

Move them back to their original location to be in sync with
openstack-infra.

Change-Id: I21a38b7be1c7a9ee2547a8bbd2f2f5018e51d15f
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-03-26 20:40:13 -04:00
parent c438e59ae9
commit 9e40c41283
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yaml
View File

@ -18,10 +18,10 @@ nodepool_user_group: nodepool
nodepool_user_home: /var/lib/nodepool
nodepool_elements_dir: ""
nodepool_elements_dir_dest: "{{ nodepool_user_home }}/elements"
nodepool_elements_dir_dest: /etc/nodepool/elements
nodepool_scripts_dir: ""
nodepool_scripts_dir_dest: "{{ nodepool_user_home }}/scripts"
nodepool_scripts_dir_dest: /etc/nodepool/scripts
nodepool_config_database_dburi: "sqlite:///{{ nodepool_user_home }}/nodepool.db"
nodepool_config_elements_dir: "{{ nodepool_elements_dir_dest }}"

12
tests/test.yaml
View File

@ -44,7 +44,7 @@
- name: Register nodepool_elements_dir_dest_stat.
stat:
path: /var/lib/nodepool/elements
path: /etc/nodepool/elements
register: nodepool_elements_dir_dest_stat
- name: Assert nodepool_elements_dir_dest tests.
@ -58,14 +58,14 @@
- nodepool_elements_dir_dest_stat.stat.gr_name == 'jenkins'
- nodepool_elements_dir_dest_stat.stat.mode == '0775'
- name: Ensure /var/lib/nodepool/elements is empty.
shell: "ls -1 /var/lib/nodepool/elements | wc -l"
- name: Ensure /etc/nodepool/elements is empty.
shell: "ls -1 /etc/nodepool/elements | wc -l"
register: result
failed_when: result.stdout != "0"
- name: Register nodepool_scripts_dir_dest_stat.
stat:
path: /var/lib/nodepool/scripts
path: /etc/nodepool/scripts
register: nodepool_scripts_dir_dest_stat
- name: Assert nodepool_scripts_dir_dest tests.
@ -79,8 +79,8 @@
- nodepool_scripts_dir_dest_stat.stat.gr_name == 'jenkins'
- nodepool_scripts_dir_dest_stat.stat.mode == '0775'
- name: Ensure /var/lib/nodepool/scripts is empty.
shell: "ls -1 /var/lib/nodepool/scripts | wc -l"
- name: Ensure /etc/nodepool/scripts is empty.
shell: "ls -1 /etc/nodepool/scripts | wc -l"
register: result
failed_when: result.stdout != "0"