diff --git a/meta/argument_specs.yml b/meta/argument_specs.yml
index 9629f82f06a18269440a7eb89b8462b9df548a25..f6f14b9b3f91cf589ea13cffe719975fc06a4020 100644
--- a/meta/argument_specs.yml
+++ b/meta/argument_specs.yml
@@ -709,7 +709,152 @@ argument_specs:
type: bool
required: false
description: The Append Only File is an alternative persistence mode that provides much better durability. Note that changing this value in a config file of an existing database and restarting the server can lead to data loss.
-# TODO line 1429 ish onwards...
+ appendfilename:
+ type: str
+ required: false
+ description: The base name of the append only file. The default is appendonly.aof.
+ appenddirname:
+ type: str
+ required: false
+ description: The name of the directory for all persistent append-only files. Default appendonlydir.
+ appendfsync:
+ type: str
+ choices:
+ - always
+ - everysec
+ - "no"
+ description: The fsync() call tells the Operating System to actually write data on disk instead of waiting for more data in the output buffer. The default is everysec.
+ no_appendfsync_on_rewrite:
+ type: bool
+ required: false
+ description: When the AOF fsync policy is set to always or everysec, and a background saving process (a background save or AOF log background rewriting) is performing a lot of I/O against the disk, in some Linux configurations the server may block too long on the fsync() call. The default is no.
+ auto_aof_rewrite_percentage:
+ type: int
+ choices:
+ - 0
+ - 1
+ - 2
+ - 3
+ - 4
+ - 5
+ - 6
+ - 7
+ - 8
+ - 9
+ - 10
+ - 11
+ - 12
+ - 13
+ - 14
+ - 15
+ - 16
+ - 17
+ - 18
+ - 19
+ - 20
+ - 21
+ - 22
+ - 23
+ - 24
+ - 25
+ - 26
+ - 27
+ - 28
+ - 29
+ - 30
+ - 31
+ - 32
+ - 33
+ - 34
+ - 35
+ - 36
+ - 37
+ - 38
+ - 39
+ - 40
+ - 41
+ - 42
+ - 43
+ - 44
+ - 45
+ - 46
+ - 47
+ - 48
+ - 49
+ - 50
+ - 51
+ - 52
+ - 53
+ - 54
+ - 55
+ - 56
+ - 57
+ - 58
+ - 59
+ - 60
+ - 61
+ - 62
+ - 63
+ - 64
+ - 65
+ - 66
+ - 67
+ - 68
+ - 69
+ - 70
+ - 71
+ - 72
+ - 73
+ - 74
+ - 75
+ - 76
+ - 77
+ - 78
+ - 79
+ - 80
+ - 81
+ - 82
+ - 83
+ - 84
+ - 85
+ - 86
+ - 87
+ - 88
+ - 89
+ - 90
+ - 91
+ - 92
+ - 93
+ - 94
+ - 95
+ - 96
+ - 97
+ - 98
+ - 99
+ - 100
+ required: false
+ description: The server is able to automatically rewrite the log file implicitly calling BGREWRITEAOF when the AOF log size grows by the specified percentage. Specify a percentage of zero in order to disable the automatic AOF rewrite feature.
+ auto_aof_rewrite_min_size:
+ type: str
+ required: false
+ description: A minimal size for the AOF file to be rewritten, this is useful to avoid rewriting the AOF file even if the percentage increase is reached but it is still pretty small.
+ aof_load_truncated:
+ type: bool
+ required: false
+ description: An AOF file may be found to be truncated at the end during the server startup process, either exit with an error when this happens, or load as much data as possible, The default is yes.
+ aof_use_rdb_preamble:
+ type: bool
+ required: false
+ description: The server can create append-only base files in either RDB or AOF formats. Using the RDB format is always faster and more efficient, the default is yes.
+ aof_timestamp_enabled:
+ type: bool
+ required: false
+ description: The server supports recording timestamp annotations in the AOF to support restoring the data from a specific point-in-time. However, using this capability changes the AOF format in a way that may not be compatible with existing AOF parsers. The default is no.
+ shutdown_timeout:
+ type: int
+ required: false
+ description: Maximum time to wait for replicas when shutting down, in seconds.
+# TODO line 1580 ish onwards...
pidfile:
type: str
required: false
diff --git a/tasks/instance_present.yml b/tasks/instance_present.yml
index 33f8ffbbba1106d8021926a50407500c37d8b233..7a7e5717b6630275023b2feec9807a0a83004739 100644
--- a/tasks/instance_present.yml
+++ b/tasks/instance_present.yml
@@ -14,7 +14,7 @@
- name: Debug valkey_instance
ansible.builtin.debug:
var: valkey_instance
- # verbosity: "{% if ansible_check_mode | bool or ansible_diff_mode | bool %}1{% else %}2{% endif %}"
+ verbosity: "{% if ansible_check_mode | bool or ansible_diff_mode | bool %}1{% else %}2{% endif %}"
tags:
- debug
@@ -127,10 +127,6 @@
- ansible_diff_mode | bool
- valkey_instance_config_file.stat.exists | bool
- - name: Debug valkey_argument_spec
- ansible.builtin.debug:
- var: valkey_argument_spec.argument_specs.main.options.valkey_instances.options.config.options
-
- name: "Valkey config file present for {{ valkey_instance.name }}"
ansible.builtin.template:
src: valkey.conf.j2
diff --git a/tasks/main.yml b/tasks/main.yml
index 1227e92773b46d95df8d6e89438323b70def3719..5ce74164b7f006f64857dd9b1368e7226927ad25 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -44,7 +44,7 @@
- name: Debug valkey_argument_spec_options
ansible.builtin.debug:
var: valkey_argument_spec_options
- # verbosity: "{% if ansible_check_mode | bool %}3{% else %}4{% endif %}"
+ verbosity: "{% if ansible_check_mode | bool %}3{% else %}4{% endif %}"
tags:
- debug
diff --git a/templates/valkey.conf.j2 b/templates/valkey.conf.j2
index c8ce65ce7f323da6ecc729ba5a66ea63a8f8f587..604edeba9d8279ea638a5bc003e50a39a9c7ef5c 100644
--- a/templates/valkey.conf.j2
+++ b/templates/valkey.conf.j2
@@ -1,14 +1,21 @@
{# j2lint: disable=jinja-variable-format #}
# {{ ansible_managed }}
#
-{% if valkey_instance.config.name is defined %}
-# Valkey configuration for {{ valkey_instance.config.name }}
+{% if valkey_instance.name is defined %}
+# Valkey configuration for {{ valkey_instance.name }}
{% else %}
# Valkey configuration
{% endif %}
{# Config loop, turn the dictionary into a key, value list #}
{% for valkey_var_pair in valkey_instance.config | ansible.builtin.dict2items %}
+{# Description from the argument specification #}
+{% if valkey_argument_spec_options[valkey_var_pair.key].description is defined %}
+# {{ valkey_argument_spec_options[valkey_var_pair.key].description }}
+{% else %}
+# The {{ valkey_var_pair.key }} variable appears to be missing from the meta/argument_specs.yml
+# if it was present the variable description would be printed here.
+{% endif %}
{# If the value is a list repeat the key for each list item #}
{% if valkey_var_pair.value | ansible.builtin.type_debug == "list" %}
{% for valkey_var_pair_value in valkey_var_pair.value %}
@@ -42,6 +49,6 @@
{{ valkey_var_pair.key | ansible.builtin.regex_replace('_', '-') }} {{ valkey_var_pair.value }}
{% endif %}
{% endif %}
-{% endfor %}
-# vim: syntax=jinja2
+{% endfor %}
+{# vim: syntax=jinja2 #}