Next round of nodepool configuration

Signed-off-by: Paul Belanger <pabelanger@redhat.com>

defaults/main.yaml

@@ -1,10 +1,28 @@
 ---
 # tasks/config.yaml
+nodepool_config_database_dburi: sqlite:////var/lib/nodepool/nodepool.db
 nodepool_config_elements_dir: /etc/nodepool/elements
+nodepool_config_gearman_servers: []
 nodepool_config_images_dir: /opt/nodepool/images
+nodepool_config_log_config: /etc/nodepool/logging.conf
+nodepool_config_secure_config: /etc/nodepool/secure.conf
 nodepool_config_script_dir: /etc/nodepool/scripts
 nodepool_config_zmq_publishers: []
 
+nodepool_file_logging_conf: etc/nodepool/logging.conf
+
+nodepool_template_nodepool_yaml_contents: |
+  diskimages: []
+  labels: []
+  providers: []
+  targets: []
+nodepool_template_nodepool_yaml_dest: /etc/nodepool/nodepool.yaml
+nodepool_template_nodepool_yaml_src: etc/nodepool/nodepool.yaml.j2
+
+nodepool_template_secure_conf_contents: ""
+nodepool_template_secure_conf_dest: /etc/nodepool/secure.conf
+nodepool_template_secure_conf_src: etc/nodepool/secure.conf.j2
+
 # tasks/install.yaml
 nodepool_git_dest: /opt/git/openstack-infra/nodepool
 nodepool_git_uri: https://git.openstack.org/openstack-infra/nodepool

files/etc/nodepool/logging.conf

@@ -0,0 +1,56 @@
+[loggers]
+keys=root,nodepool,requests,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_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.TimedRotatingFileHandler
+formatter=simple
+args=('/var/log/nodepool/debug.log', 'H', 8, 30,)
+
+[handler_normal]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('/var/log/nodepool/nodepool.log', 'H', 8, 30,)
+
+[handler_image]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('/var/log/nodepool/image.log', 'H', 8, 30,)
+
+[formatter_simple]
+format=%(asctime)s %(levelname)s %(name)s: %(message)s
+datefmt=

files/nodepool.service

@@ -6,7 +6,7 @@ Type=simple
 User=nodepool
 Group=nodepool
 EnvironmentFile=-/etc/sysconfig/nodepool
-ExecStart=/usr/bin/nodepoold -d
+ExecStart=/usr/bin/nodepoold -d -l /etc/nodepool/logging.conf
 
 StandardOutput=syslog
 StandardError=syslog

handlers/main.yaml

@@ -1,2 +1,6 @@
 ---
-# handlers file for nodepool
+- name: Restart nodepool
+  service:
+    name: nodepool
+    state: restarted
+  sudo: yes

tasks/config.yaml

@@ -14,13 +14,19 @@
   with_items:
     - /etc/nodepool
     - "{{ nodepool_config_images_dir }}"
-    - /var/lib/nodepool
     - /var/log/nodepool
 
-- name: Template nodepool configuration file.
+- name: Template secure configuration file.
   template:
-    dest: /etc/nodepool/nodepool.yaml
-    src: nodepool.yaml.j2
+    dest: "{{ nodepool_template_secure_conf_dest }}"
+    src: "{{ nodepool_template_secure_conf_src }}"
+  notify: Restart nodepool
+
+- name: Template yaml configuration file.
+  template:
+    dest: "{{ nodepool_template_nodepool_yaml_dest }}"
+    src: "{{ nodepool_template_nodepool_yaml_src }}"
+  notify: Restart nodepool
 
 - name: Copy sudoers file into place.
   copy:
@@ -30,3 +36,9 @@
     owner: root
     src: nodepool.sudoers
     validate: 'visudo -cf %s'
+
+- name: Copy logging configuration file.
+  copy:
+    dest: "{{ nodepool_config_log_config }}"
+    src: "{{ nodepool_file_logging_conf }}"
+  notify: Restart nodepool

tasks/main.yaml

@@ -2,9 +2,6 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yaml"
 
-- name: Include nodepool configuration defaults.
-  include_vars: nodepool.yaml
-
 - include: install.yaml
   sudo: yes
 

templates/etc/nodepool/nodepool.yaml.j2

@@ -0,0 +1,14 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#
+dburi: {{ nodepool_config_database_dburi }}
+elements-dir: {{ nodepool_config_elements_dir }}
+images-dir: {{ nodepool_config_images_dir }}
+script-dir: {{ nodepool_config_script_dir }}
+
+{% set _gearman_servers = { 'gearman-servers': nodepool_config_gearman_servers } -%}
+{{ _gearman_servers | to_nice_yaml }}
+{% set _zmq_publishers = { 'zmq-publishers': nodepool_config_zmq_publishers } -%}
+{{ _zmq_publishers | to_nice_yaml }}
+{{ nodepool_template_nodepool_yaml_contents }}
+# {{ ansible_managed }}

templates/etc/nodepool/secure.conf.j2

@@ -0,0 +1,8 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#
+[database]
+dburi = {{ nodepool_config_database_dburi }}
+
+{{ nodepool_template_secure_conf_contents }}
+# {{ ansible_managed }}

templates/nodepool.yaml.j2

@@ -1,19 +0,0 @@
-elements-dir: {{ nodepool_config_elements_dir }}
-images-dir: {{nodepool_config_images_dir }}
-script-dir: {{ nodepool_config_script_dir }}
-
-# TODO(pabelanger): Remove hardcoded variable.
-dburi: sqlite:////var/lib/nodepool/nodepool.db
-
-{% set _zmq_publishers = { 'zmq-publishers': nodepool_config_zmq_publishers } -%}
-{{ _zmq_publishers | to_nice_yaml }}
-{% set _diskimages = { 'diskimages': diskimages } -%}
-{{ _diskimages | to_nice_yaml }}
-{% set _labels = { 'labels': labels } -%}
-{{ _labels | to_nice_yaml }}
-{% set _providers = { 'providers': providers } -%}
-{{ _providers | to_nice_yaml }}
-{% set _targets = { 'targets': targets } -%}
-{{ _targets | to_nice_yaml }}
-
-# {{ ansible_managed }}

vars/nodepool.yaml

@@ -1,5 +0,0 @@
----
-diskimages: []
-labels: []
-providers: []
-targets: []