diff --git a/defaults/main.yaml b/defaults/main.yaml index 4e56cd2..de05a10 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -54,6 +54,12 @@ nodepool_file_logging_conf_mode: 0644 nodepool_file_logging_conf_owner: "{{ nodepool_user_name }}" nodepool_file_logging_conf_src: etc/nodepool/logging.conf +nodepool_file_builder_logging_conf_dest: /etc/nodepool/builder-logging.conf +nodepool_file_builder_logging_conf_group: "{{ nodepool_user_group }}" +nodepool_file_builder_logging_conf_mode: 0644 +nodepool_file_builder_logging_conf_owner: "{{ nodepool_user_name }}" +nodepool_file_builder_logging_conf_src: etc/nodepool/builder-logging.conf + # tasks/install.yaml nodepool_git_dest: /opt/ansible-role-nodepool/git/openstack-infra/nodepool nodepool_git_uri: https://git.openstack.org/openstack-infra/nodepool diff --git a/files/etc/default/nodepool-builder b/files/etc/default/nodepool-builder index 3f03756..c359a3d 100644 --- a/files/etc/default/nodepool-builder +++ b/files/etc/default/nodepool-builder @@ -7,6 +7,6 @@ PREFIX=/usr/local # Options to pass to nodepool-builder. -ARGS="-l /etc/nodepool/logging.conf" +ARGS="-l /etc/nodepool/builder-logging.conf" DIB_IMAGE_CACHE=/opt/nodepool/cache diff --git a/files/etc/nodepool/builder-logging.conf b/files/etc/nodepool/builder-logging.conf new file mode 100644 index 0000000..e69e7aa --- /dev/null +++ b/files/etc/nodepool/builder-logging.conf @@ -0,0 +1,61 @@ +[loggers] +keys=root,nodepool,requests,shade,image + +[handlers] +keys=console,debug,normal,image + +[formatters] +keys=simple + +[logger_root] +level=WARNING +handlers=console + +[logger_requests] +level=WARNING +handlers=debug,normal +qualname=requests + +[logger_shade] +level=DEBUG +handlers=debug,normal +qualname=shade + +[logger_nodepool] +level=DEBUG +handlers=debug,normal +qualname=nodepool + +[logger_image] +level=INFO +handlers=image +qualname=nodepool.image.build +propagate=0 + +[handler_console] +level=WARNING +class=StreamHandler +formatter=simple +args=(sys.stdout,) + +[handler_debug] +level=DEBUG +class=logging.handlers.WatchedFileHandler +formatter=simple +args=('/var/log/nodepool/builder-debug.log',) + +[handler_normal] +level=INFO +class=logging.handlers.WatchedFileHandler +formatter=simple +args=('/var/log/nodepool/nodepool-builder.log',) + +[handler_image] +level=INFO +class=logging.handlers.WatchedFileHandler +formatter=simple +args=('/var/log/nodepool/image.log',) + +[formatter_simple] +format=%(asctime)s %(levelname)s %(name)s: %(message)s +datefmt= diff --git a/files/etc/sysconfig/nodepool-builder b/files/etc/sysconfig/nodepool-builder index 650bf77..8e40f1c 100644 --- a/files/etc/sysconfig/nodepool-builder +++ b/files/etc/sysconfig/nodepool-builder @@ -7,6 +7,6 @@ PREFIX=/usr # Options to pass to nodepool-builder. -ARGS="-l /etc/nodepool/logging.conf" +ARGS="-l /etc/nodepool/builder-logging.conf" DIB_IMAGE_CACHE=/opt/nodepool/cache diff --git a/tasks/config.yaml b/tasks/config.yaml index 73a13e1..c07693e 100644 --- a/tasks/config.yaml +++ b/tasks/config.yaml @@ -53,6 +53,16 @@ src: "{{ nodepool_file_logging_conf_src }}" register: nodepool_file_logging_conf +- name: Copy builder logging configuration file. + become: yes + copy: + dest: "{{ nodepool_file_builder_logging_conf_dest }}" + group: "{{ nodepool_file_builder_logging_conf_group }}" + mode: "{{ nodepool_file_builder_logging_conf_mode }}" + owner: "{{nodepool_file_builder_logging_conf_owner }}" + src: "{{ nodepool_file_builder_logging_conf_src }}" + register: nodepool_file_builder_logging_conf + - name: Copy nodepool elements directory. become: yes copy: diff --git a/tests/test.yaml b/tests/test.yaml index 6c82369..d4c46ad 100644 --- a/tests/test.yaml +++ b/tests/test.yaml @@ -33,6 +33,7 @@ - nodepool_file_nodepool_yaml - nodepool_file_secure_conf - nodepool_file_logging_conf + - nodepool_file_builder_logging_conf - nodepool_file_nodepool_elements - nodepool_file_nodepool_scripts - nodepool_file_nodepool_service @@ -88,6 +89,20 @@ - logging_conf_stat.stat.gr_name == 'nodepool' - logging_conf_stat.stat.mode == '0644' + - name: Register /etc/nodepool/builder-logging.conf + stat: + path: /etc/nodepool/builder-logging.conf + register: builder_logging_conf_stat + + - name: Assert buidler_logging_conf_stat tests. + assert: + that: + - builder_logging_conf_stat.stat.exists + - builder_logging_conf_stat.stat.isreg + - builder_logging_conf_stat.stat.pw_name == 'nodepool' + - builder_logging_conf_stat.stat.gr_name == 'nodepool' + - builder_logging_conf_stat.stat.mode == '0644' + - name: Register /etc/nodepool/secure.conf stat: path: /etc/nodepool/secure.conf