From e2750d89a18c08f95bc8464b5a5dcbf2e50ce01f Mon Sep 17 00:00:00 2001 From: Patrick Hasler Date: Mon, 12 Feb 2024 12:36:41 +0100 Subject: [PATCH] fix(ci): workaround for broken LDAP plugin package Debian * chore(lint): replace yes/no with true/false in molecule --- molecule/default/converge.yml | 28 +++++++++++++++------------- molecule/default/prepare.yml | 6 +++--- molecule/default/verify.yml | 4 +++- vars/Debian.yml | 1 + 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 43019a3..435a7ab 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -1,14 +1,14 @@ --- - name: Converge hosts: all - become: yes - gather_facts: yes + become: true + gather_facts: true roles: - role: ansible-role-bareos_fd - bareos_fd_backup_configurations: yes - bareos_fd_install_debug_packages: yes - bareos_fd_encryption_enabled: yes + bareos_fd_backup_configurations: true + bareos_fd_install_debug_packages: true + bareos_fd_encryption_enabled: true bareos_fd_encryption_private_key: | -----BEGIN RSA PRIVATE KEY----- MIIJKAIBAAKCAgEAvFS5DDxBm2Hgf6LM2QnU3eKTw6PHpCBESjuqoKDnwnjL9wXH @@ -88,13 +88,13 @@ bareos_fd_directors: - name: "bareos-dir" password: "secretpassword" - monitor: no - connection_from_client_to_director: yes - connection_from_director_to_client: no - tls_enable: yes - tls_verify_peer: no + monitor: false + connection_from_client_to_director: true + connection_from_director_to_client: false + tls_enable: true + tls_verify_peer: false - name: "disabled-director" - enabled: no + enabled: false bareos_fd_messages: - name: "Standard" director: @@ -115,9 +115,11 @@ - "!skipped" - "!saved" - name: "disabled-message" - enabled: no + enabled: false bareos_fd_plugins: - mariabackup - mysql - - ldap - postgresql + # TODO disabled as package `bareos-filedaemon-ldap-python-plugin` + # has broken dependencies on Debian (python-ldap instead of python3-ldap) + # - ldap diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index c980188..8af8b33 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -1,10 +1,10 @@ --- - name: Prepare hosts: all - become: yes - gather_facts: no + become: true + gather_facts: true roles: - role: robertdebock.bootstrap - role: adfinis.bareos_repository - bareos_repository_enable_tracebacks: yes + bareos_repository_enable_tracebacks: true diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 6854b50..e0719ac 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -23,7 +23,9 @@ name: - bareos-filedaemon-mariabackup-python-plugin - bareos-filedaemon-postgresql-python-plugin - - bareos-filedaemon-ldap-python-plugin + # TODO disabled as package `bareos-filedaemon-ldap-python-plugin` + # has broken dependencies on Debian (python-ldap instead of python3-ldap) + # - bareos-filedaemon-ldap-python-plugin state: present check_mode: true diff: true diff --git a/vars/Debian.yml b/vars/Debian.yml index f4b59e7..459ce77 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -21,4 +21,5 @@ bareos_fd_plugin_list: - name: ldap packages: + - python3-ldap - bareos-filedaemon-ldap-python-plugin