Clean up variable naming
This commit is contained in:
parent
d55e0b77af
commit
ab6b33f4af
@ -23,7 +23,7 @@ def load_and_validate_config_file(config_file_path):
|
|||||||
with open(config_file_path, encoding="utf-8") as config_file:
|
with open(config_file_path, encoding="utf-8") as config_file:
|
||||||
config = yaml.safe_load(config_file)
|
config = yaml.safe_load(config_file)
|
||||||
|
|
||||||
for key in ["dataset", "syncoid_dataset"]:
|
for key in ["dataset", "backup_dataset"]:
|
||||||
if key not in config:
|
if key not in config:
|
||||||
raise KeyError(f"{key} must be present in {config_file_path}")
|
raise KeyError(f"{key} must be present in {config_file_path}")
|
||||||
|
|
||||||
@ -45,6 +45,6 @@ if __name__ == "__main__":
|
|||||||
if config.get("skip_parent", False):
|
if config.get("skip_parent", False):
|
||||||
syncoid_cmd.append("--skip-parent")
|
syncoid_cmd.append("--skip-parent")
|
||||||
syncoid_cmd.append(config["dataset"])
|
syncoid_cmd.append(config["dataset"])
|
||||||
syncoid_cmd.append(config["syncoid_dataset"])
|
syncoid_cmd.append(config["backup_dataset"])
|
||||||
|
|
||||||
subprocess.run(syncoid_cmd, check=True)
|
subprocess.run(syncoid_cmd, check=True)
|
||||||
|
@ -4,12 +4,12 @@
|
|||||||
insertbefore: "# BEGIN ANSIBLE MANAGED BLOCK TEMPLATES #"
|
insertbefore: "# BEGIN ANSIBLE MANAGED BLOCK TEMPLATES #"
|
||||||
marker: "# {mark} ANSIBLE MANAGED BLOCK SERVICE {{ services_service_name }} #"
|
marker: "# {mark} ANSIBLE MANAGED BLOCK SERVICE {{ services_service_name }} #"
|
||||||
block: |
|
block: |
|
||||||
[{{ services_backups_user_dataset }}]
|
[{{ services_backups_user_data_dataset }}]
|
||||||
use_template = production
|
use_template = production
|
||||||
recursive = yes
|
recursive = yes
|
||||||
process_children_only = yes
|
process_children_only = yes
|
||||||
|
|
||||||
[{{ services_backups_user_syncoid_dataset }}]
|
[{{ services_backups_backup_user_data_dataset }}]
|
||||||
use_template = backup
|
use_template = backup
|
||||||
recursive = yes
|
recursive = yes
|
||||||
process_children_only = yes
|
process_children_only = yes
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
dataset: {{ services_backups_user_dataset }}
|
dataset: {{ services_backups_user_data_dataset }}
|
||||||
syncoid_dataset: {{ services_backups_user_syncoid_dataset }}
|
backup_dataset: {{ services_backups_backup_user_data_dataset }}
|
||||||
recursive: true
|
recursive: true
|
||||||
skip_parent: true
|
skip_parent: true
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
services_backups_user_dataset: "{{ services_data_dataset }}/{{ services_service_user_name }}"
|
services_backups_user_data_dataset: "{{ services_data_dataset }}/{{ services_service_user_name }}"
|
||||||
services_backups_user_syncoid_dataset: "\
|
services_backups_backup_user_data_dataset: "\
|
||||||
{{ services_backups_backup_data_dataset }}/{{ services_service_user_name }}"
|
{{ services_backups_backup_data_dataset }}/{{ services_service_user_name }}"
|
||||||
|
Loading…
Reference in New Issue
Block a user