summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2018-12-20 10:45:21 -0500
committerPaul Belanger <pabelanger@redhat.com>2018-12-20 10:45:21 -0500
commit96ac665eaa802e3697e51bad8eeb3b41718ce547 (patch)
treedd5479a9a84e1905f900f74030025aa1d846d4f9
parente961f43cc3b9b5ab0a3b18bd4ae65341e5b0382d (diff)
Add manage toggle for logging config
Allow a user to toggle the installation of logging files, as we allow them to disable services. Change-Id: Ie354cb0547fa247f940aa15222bbf4994d4201ee Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: Paul Belanger <pabelanger@redhat.com> Workflow+1: Paul Belanger <pabelanger@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 20 Dec 2018 22:05:40 +0000 Reviewed-on: https://review.openstack.org/626649 Project: openstack/ansible-role-nodepool Branch: refs/heads/master
-rw-r--r--defaults/main.yaml2
-rw-r--r--tasks/config.yaml2
2 files changed, 4 insertions, 0 deletions
diff --git a/defaults/main.yaml b/defaults/main.yaml
index 902f20c..886aa00 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -40,12 +40,14 @@ nodepool_file_secure_conf_src: etc/nodepool/secure.conf
40 40
41nodepool_file_builder_logging_conf_dest: /etc/nodepool/builder-logging.conf 41nodepool_file_builder_logging_conf_dest: /etc/nodepool/builder-logging.conf
42nodepool_file_builder_logging_conf_group: "{{ nodepool_user_group }}" 42nodepool_file_builder_logging_conf_group: "{{ nodepool_user_group }}"
43nodepool_file_builder_logging_conf_manage: true
43nodepool_file_builder_logging_conf_mode: 0644 44nodepool_file_builder_logging_conf_mode: 0644
44nodepool_file_builder_logging_conf_owner: "{{ nodepool_user_name }}" 45nodepool_file_builder_logging_conf_owner: "{{ nodepool_user_name }}"
45nodepool_file_builder_logging_conf_src: etc/nodepool/builder-logging.conf 46nodepool_file_builder_logging_conf_src: etc/nodepool/builder-logging.conf
46 47
47nodepool_file_launcher_logging_conf_dest: /etc/nodepool/launcher-logging.conf 48nodepool_file_launcher_logging_conf_dest: /etc/nodepool/launcher-logging.conf
48nodepool_file_launcher_logging_conf_group: "{{ nodepool_user_group }}" 49nodepool_file_launcher_logging_conf_group: "{{ nodepool_user_group }}"
50nodepool_file_launcher_logging_conf_manage: true
49nodepool_file_launcher_logging_conf_mode: 0644 51nodepool_file_launcher_logging_conf_mode: 0644
50nodepool_file_launcher_logging_conf_owner: "{{ nodepool_user_name }}" 52nodepool_file_launcher_logging_conf_owner: "{{ nodepool_user_name }}"
51nodepool_file_launcher_logging_conf_src: etc/nodepool/launcher-logging.conf 53nodepool_file_launcher_logging_conf_src: etc/nodepool/launcher-logging.conf
diff --git a/tasks/config.yaml b/tasks/config.yaml
index 22ea91f..4b4c565 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -54,6 +54,7 @@
54 owner: "{{nodepool_file_builder_logging_conf_owner }}" 54 owner: "{{nodepool_file_builder_logging_conf_owner }}"
55 src: "{{ nodepool_file_builder_logging_conf_src }}" 55 src: "{{ nodepool_file_builder_logging_conf_src }}"
56 register: nodepool_file_builder_logging_conf 56 register: nodepool_file_builder_logging_conf
57 when: nodepool_file_builder_logging_conf_manage
57 58
58- name: Install launcher logging configuration file. 59- name: Install launcher logging configuration file.
59 become: true 60 become: true
@@ -64,3 +65,4 @@
64 owner: "{{nodepool_file_launcher_logging_conf_owner }}" 65 owner: "{{nodepool_file_launcher_logging_conf_owner }}"
65 src: "{{ nodepool_file_launcher_logging_conf_src }}" 66 src: "{{ nodepool_file_launcher_logging_conf_src }}"
66 register: nodepool_file_launcher_logging_conf 67 register: nodepool_file_launcher_logging_conf
68 when: nodepool_file_launcher_logging_conf_manage