Clean up logging.conf settings

Change-Id: I8117498c19b2fb72603245efce8e708276b37f10
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-10-07 20:12:20 -04:00
parent 26a9f241ee
commit 7d24cad3cd
3 changed files with 24 additions and 5 deletions

View File

@ -48,9 +48,11 @@ nodepool_file_secure_conf_mode: 0600
nodepool_file_secure_conf_owner: "{{ nodepool_user_name }}"
nodepool_file_secure_conf_src: etc/nodepool/secure.conf
nodepool_config_log_config: /etc/nodepool/logging.conf
nodepool_file_logging_conf: etc/nodepool/logging.conf
nodepool_file_logging_conf_dest: /etc/nodepool/logging.conf
nodepool_file_logging_conf_group: "{{ nodepool_user_group }}"
nodepool_file_logging_conf_mode: 0644
nodepool_file_logging_conf_owner: "{{ nodepool_user_name }}"
nodepool_file_logging_conf_src: etc/nodepool/logging.conf
# tasks/install.yaml
nodepool_git_dest: /opt/ansible-role-nodepool/git/openstack-infra/nodepool

View File

@ -44,8 +44,11 @@
- name: Copy logging configuration file.
become: yes
copy:
dest: "{{ nodepool_config_log_config }}"
src: "{{ nodepool_file_logging_conf }}"
dest: "{{ nodepool_file_logging_conf_dest }}"
group: "{{ nodepool_file_logging_conf_group }}"
mode: "{{ nodepool_file_logging_conf_mode }}"
owner: "{{nodepool_file_logging_conf_owner }}"
src: "{{ nodepool_file_logging_conf_src }}"
- name: Copy nodepool elements directory.
become: yes

View File

@ -59,6 +59,20 @@
- nodepool_yaml_stat.stat.gr_name == 'nodepool'
- nodepool_yaml_stat.stat.mode == '0644'
- name: Register /etc/nodepool/logging.conf
stat:
path: /etc/nodepool/logging.conf
register: logging_conf_stat
- name: Assert logging_conf_stat tests.
assert:
that:
- logging_conf_stat.stat.exists
- logging_conf_stat.stat.isreg
- logging_conf_stat.stat.pw_name == 'nodepool'
- logging_conf_stat.stat.gr_name == 'nodepool'
- logging_conf_stat.stat.mode == '0644'
- name: Register /etc/nodepool/secure.conf
stat:
path: /etc/nodepool/secure.conf