From 87b8af323323e8a42a5b6433bed85ac144362e29 Mon Sep 17 00:00:00 2001 From: phil Date: Thu, 2 Nov 2023 08:53:10 +0100 Subject: [PATCH] Make namespace configurable --- README.md | 5 +++-- defaults/main.yml | 2 ++ templates/all.txt.j2 | 2 +- templates/hypervisor.txt.j2 | 2 +- templates/servers.txt.j2 | 6 +++--- templates/storage_boxes.txt.j2 | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 defaults/main.yml diff --git a/README.md b/README.md index 7ca43eb..c214518 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ Voraussetzung ist weiterhin eine Inventory-Gruppe namens `storage_boxes`, die al ## Variablen -| Variable Name | Function | Default value | File | -| ------------- | -------- | ------------- | ---- | +| Variable | Beschreibung | Default | File | +| -------- | ------------ | ------- | ---- | | `cmdb` | Dictionary for dokuwiki server variables _(required)_ | -- | `group_vars/all/cmdb.yml` | | `cmdb.wiki_server` | dokuwiki server _(required)_ | -- | `group_vars/all/cmdb.yml` | | `cmdb.wiki_conf_file_path` | Pfad zur `local.php` des Wikis _(required)_, Bspw: `/etc/dokuwiki/farm/mywiki/local.php` | -- | `group_vars/al/cmdb` | @@ -26,6 +26,7 @@ Voraussetzung ist weiterhin eine Inventory-Gruppe namens `storage_boxes`, die al | `cmdb.wiki_meta_path` | path for metadata on dokuwiki server _(required)_ | -- | `group_vars/all/cmdb.yml` | | `cmdb.wiki_user` | File system user of wiki files and directories _(required)_ | -- | `group_vars/all/cmdb.yml`| | `cmdb.wiki_group` | File system group of wiki files and directories _(required)_ | -- | `group_vars/all/cmdb.yml`| +| `cmdb_namespace` | Namespace für alle CMDB-Seiten _(required)_ | `cmdb` | `group_vars/all/cmdb` | | `cmdb_documentation_path` | Wiki-Pfad zur Dokumentation den Hosts _(required)_ | --| `group_vars/all/cmdb` oder `host_vars/..` | | `cmdb_customer` | Name der Kundin/ Besitzerin des Hosts | -- | `host_vars/..` | | `cmdb_customer_service_agreement` | Link zum Servicevertrag im Wiki | -- | `host_vars/..` | diff --git a/defaults/main.yml b/defaults/main.yml new file mode 100644 index 0000000..05c252f --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,2 @@ +--- +cmdb_namespace: cmdb diff --git a/templates/all.txt.j2 b/templates/all.txt.j2 index 0cb4c69..b898e64 100644 --- a/templates/all.txt.j2 +++ b/templates/all.txt.j2 @@ -1,5 +1,5 @@ ====== Alle Server ====== {% for host in groups['all'] | sort %} - * [[cmdb:servers:all:{{ host }}]] + * [[{{ cmdb_namespace }}:servers:all:{{ host }}]] {% endfor %} diff --git a/templates/hypervisor.txt.j2 b/templates/hypervisor.txt.j2 index f1162fb..a647d5e 100644 --- a/templates/hypervisor.txt.j2 +++ b/templates/hypervisor.txt.j2 @@ -1,5 +1,5 @@ ====== Hypervisor ====== {% for host in groups['virt_kvm_host'] | sort %} - * [[cmdb:servers:all:{{ host }}]] + * [[{{ cmdb_namespace }}:servers:all:{{ host }}]] {% endfor %} diff --git a/templates/servers.txt.j2 b/templates/servers.txt.j2 index a90825c..ffe34f0 100644 --- a/templates/servers.txt.j2 +++ b/templates/servers.txt.j2 @@ -1,5 +1,5 @@ ===== Server ===== - * [[cmdb:servers:all|Alle Server]] - * [[cmdb:servers:hypervisor|Hypervisor]] - * [[cmdb:servers:storage_boxes|Storage Boxes]] + * [[{{ cmdb_namespace }}:servers:all|Alle Server]] + * [[{{ cmdb_namespace }}:servers:hypervisor|Hypervisor]] + * [[{{ cmdb_namespace }}:servers:storage_boxes|Storage Boxes]] diff --git a/templates/storage_boxes.txt.j2 b/templates/storage_boxes.txt.j2 index f716f9b..d531e1a 100644 --- a/templates/storage_boxes.txt.j2 +++ b/templates/storage_boxes.txt.j2 @@ -1,5 +1,5 @@ ====== Storage Boxes ====== {% for host in groups['storage_boxes'] | sort %} - * [[cmdb:servers:all:{{ host }}]] + * [[{{ cmdb_namespace }}:servers:all:{{ host }}]] {% endfor %}