Drop synchronize support for elements
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: I68ae9e7cb6e4a69392ea95cd0be72e01f166190e Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
354161295f
commit
7220ba6dac
|
@ -49,10 +49,6 @@ Role Variables
|
|||
# Default: /var/lib/nodepool
|
||||
nodepool_user_home: /var/lib/nodepool
|
||||
|
||||
# Path to folder containing elements used by nodepool.
|
||||
# Default: ""
|
||||
nodepool_elements_dir: ""
|
||||
|
||||
# Path to folder containing scripts used by nodepool.
|
||||
# Default: ""
|
||||
nodepool_scripts_dir: ""
|
||||
|
|
|
@ -24,6 +24,12 @@ nodepool_user_name: nodepool
|
|||
nodepool_user_group: nodepool
|
||||
nodepool_user_home: /var/lib/nodepool
|
||||
|
||||
nodepool_file_nodepool_elements_dest: /etc/nodepool/elements
|
||||
nodepool_file_nodepool_elements_group: "{{ nodepool_user_group }}"
|
||||
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_yaml_dest: /etc/nodepool/nodepool.yaml
|
||||
nodepool_file_nodepool_yaml_group: "{{ nodepool_user_group }}"
|
||||
nodepool_file_nodepool_yaml_mode: 0644
|
||||
|
@ -36,13 +42,9 @@ nodepool_file_secure_conf_mode: 0600
|
|||
nodepool_file_secure_conf_owner: "{{ nodepool_user_name }}"
|
||||
nodepool_file_secure_conf_src: etc/nodepool/secure.conf
|
||||
|
||||
nodepool_elements_dir: ""
|
||||
nodepool_elements_dir_dest: /etc/nodepool/elements
|
||||
|
||||
nodepool_scripts_dir: ""
|
||||
nodepool_scripts_dir_dest: /etc/nodepool/scripts
|
||||
|
||||
nodepool_config_elements_dir: "{{ nodepool_elements_dir_dest }}"
|
||||
nodepool_config_images_dir: /opt/nodepool/images
|
||||
nodepool_config_log_config: /etc/nodepool/logging.conf
|
||||
nodepool_config_scripts_dir: "{{ nodepool_scripts_dir_dest }}"
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
# 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.
|
|
@ -0,0 +1,5 @@
|
|||
# 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.
|
|
@ -49,26 +49,14 @@
|
|||
dest: "{{ nodepool_config_log_config }}"
|
||||
src: "{{ nodepool_file_logging_conf }}"
|
||||
|
||||
- name: Create nodepool elements directory.
|
||||
- name: Copy nodepool elements directory.
|
||||
become: yes
|
||||
file:
|
||||
group: "{{ ansible_user }}"
|
||||
mode: 0775
|
||||
owner: "{{ ansible_user }}"
|
||||
path: "{{ item }}"
|
||||
state: directory
|
||||
with_items:
|
||||
- "{{ nodepool_elements_dir_dest }}"
|
||||
|
||||
- name: Rsync nodepool elements directory.
|
||||
become: no
|
||||
synchronize:
|
||||
dest: "{{ nodepool_elements_dir_dest }}"
|
||||
perms: yes
|
||||
rsync_opts:
|
||||
- '--delete'
|
||||
src: "{{ nodepool_elements_dir }}"
|
||||
when: nodepool_elements_dir != ""
|
||||
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 }}"
|
||||
|
||||
- name: Create nodepool scripts directory.
|
||||
become: yes
|
||||
|
|
|
@ -83,17 +83,9 @@
|
|||
that:
|
||||
- nodepool_elements_dir_dest_stat.stat.exists
|
||||
- nodepool_elements_dir_dest_stat.stat.isdir
|
||||
# NOTE(pabelanger): This means we are hardcoded to the
|
||||
# openstack-infra jenkins user in nodepool.
|
||||
- nodepool_elements_dir_dest_stat.stat.pw_name == 'jenkins'
|
||||
- nodepool_elements_dir_dest_stat.stat.gr_name == 'jenkins'
|
||||
- nodepool_elements_dir_dest_stat.stat.mode == '0775'
|
||||
|
||||
- name: Ensure /etc/nodepool/elements is empty.
|
||||
shell: "ls -1 /etc/nodepool/elements | wc -l"
|
||||
register: result
|
||||
failed_when: result.stdout != "0"
|
||||
tags: skip_ansible_lint
|
||||
- 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_scripts_dir_dest_stat.
|
||||
stat:
|
||||
|
|
Loading…
Reference in New Issue