diff --git a/deploy_ovh_instance.yml b/deploy_ovh_instance.yml index 71bbacc..7fc83d2 100644 --- a/deploy_ovh_instance.yml +++ b/deploy_ovh_instance.yml @@ -95,22 +95,6 @@ - common - always - - name: Register variable DUPLICITY_PASSPHRASE - command: "cat {{ remote_workdir }}/duplicity_passphrase" - register: cat_duplicity_passphrase - changed_when: false - tags: - - common - - always - - - name: Set variable DUPLICITY_PASSPHRASE - set_fact: - "DUPLICITY_PASSPHRASE": "{{ cat_duplicity_passphrase.stdout }}" - changed_when: false - tags: - - common - - always - - name: Include role_configure_ovh_instance ansible.builtin.include_role: name: role_configure_ovh_instance diff --git a/roles/role_deploy_SemanticScuttle/tasks/main.yml b/roles/role_deploy_SemanticScuttle/tasks/main.yml index e2e87a0..712487f 100644 --- a/roles/role_deploy_SemanticScuttle/tasks/main.yml +++ b/roles/role_deploy_SemanticScuttle/tasks/main.yml @@ -57,7 +57,7 @@ SWIFT_REGIONNAME: "{{ SWIFT_REGIONNAME }}" SWIFT_TENANTNAME: "{{ OS_TENANT_NAME }}" SWIFT_AUTHVERSION: "{{ OS_IDENTITY_API_VERSION }}" - PASSPHRASE: "{{ DUPLICITY_PASSPHRASE}}" + PASSPHRASE: "{{ duplicity_passphrase }}" # /usr/bin/duplicity uses "-s" python argument to prevent loading modules from user's python directory, # this variable will override that. PYTHONPATH: ".local/lib/python3.9/site-packages" diff --git a/roles/role_deploy_dovecot/tasks/main.yml b/roles/role_deploy_dovecot/tasks/main.yml index 52f0fde..fdd53fa 100644 --- a/roles/role_deploy_dovecot/tasks/main.yml +++ b/roles/role_deploy_dovecot/tasks/main.yml @@ -39,7 +39,7 @@ SWIFT_REGIONNAME: "{{ SWIFT_REGIONNAME }}" SWIFT_TENANTNAME: "{{ OS_TENANT_NAME }}" SWIFT_AUTHVERSION: "{{ OS_IDENTITY_API_VERSION }}" - PASSPHRASE: "{{ DUPLICITY_PASSPHRASE}}" + PASSPHRASE: "{{ duplicity_passphrase }}" # /usr/bin/duplicity uses "-s" python argument to prevent loading modules from user's python directory, # this variable will override that. PYTHONPATH: ".local/lib/python3.9/site-packages" diff --git a/roles/role_deploy_grafana/tasks/main.yml b/roles/role_deploy_grafana/tasks/main.yml index aed2cfe..ad18711 100644 --- a/roles/role_deploy_grafana/tasks/main.yml +++ b/roles/role_deploy_grafana/tasks/main.yml @@ -54,7 +54,7 @@ SWIFT_REGIONNAME: "{{ SWIFT_REGIONNAME }}" SWIFT_TENANTNAME: "{{ OS_TENANT_NAME }}" SWIFT_AUTHVERSION: "{{ OS_IDENTITY_API_VERSION }}" - PASSPHRASE: "{{ DUPLICITY_PASSPHRASE}}" + PASSPHRASE: "{{ duplicity_passphrase }}" # /usr/bin/duplicity uses "-s" python argument to prevent loading modules from user's python directory, # this variable will override that. PYTHONPATH: ".local/lib/python3.9/site-packages" diff --git a/roles/role_deploy_nextcloud/tasks/main.yml b/roles/role_deploy_nextcloud/tasks/main.yml index 1eaf9dc..4ab19bb 100644 --- a/roles/role_deploy_nextcloud/tasks/main.yml +++ b/roles/role_deploy_nextcloud/tasks/main.yml @@ -36,7 +36,7 @@ SWIFT_REGIONNAME: "{{ SWIFT_REGIONNAME }}" SWIFT_TENANTNAME: "{{ OS_TENANT_NAME }}" SWIFT_AUTHVERSION: "{{ OS_IDENTITY_API_VERSION }}" - PASSPHRASE: "{{ DUPLICITY_PASSPHRASE}}" + PASSPHRASE: "{{ duplicity_passphrase }}" # /usr/bin/duplicity uses "-s" python argument to prevent loading modules from user's python directory, # this variable will override that. PYTHONPATH: ".local/lib/python3.9/site-packages" diff --git a/roles/role_deploy_registry/tasks/main.yml b/roles/role_deploy_registry/tasks/main.yml index 6872c8a..ce5ea7e 100644 --- a/roles/role_deploy_registry/tasks/main.yml +++ b/roles/role_deploy_registry/tasks/main.yml @@ -62,7 +62,7 @@ SWIFT_REGIONNAME: "{{ SWIFT_REGIONNAME }}" SWIFT_TENANTNAME: "{{ OS_TENANT_NAME }}" SWIFT_AUTHVERSION: "{{ OS_IDENTITY_API_VERSION }}" - PASSPHRASE: "{{ DUPLICITY_PASSPHRASE}}" + PASSPHRASE: "{{ duplicity_passphrase }}" # /usr/bin/duplicity uses "-s" python argument to prevent loading modules from user's python directory, # this variable will override that. PYTHONPATH: ".local/lib/python3.9/site-packages" diff --git a/tasks/deploy_gogs.yml b/tasks/deploy_gogs.yml index c0152a9..123e118 100644 --- a/tasks/deploy_gogs.yml +++ b/tasks/deploy_gogs.yml @@ -36,7 +36,7 @@ SWIFT_REGIONNAME: "{{ SWIFT_REGIONNAME }}" SWIFT_TENANTNAME: "{{ OS_TENANT_NAME }}" SWIFT_AUTHVERSION: "{{ OS_IDENTITY_API_VERSION }}" - PASSPHRASE: "{{ DUPLICITY_PASSPHRASE}}" + PASSPHRASE: "{{ duplicity_passphrase }}" # /usr/bin/duplicity uses "-s" python argument to prevent loading modules from user's python directory, # this variable will override that. PYTHONPATH: ".local/lib/python3.9/site-packages" diff --git a/tasks/deploy_reverse-proxy.yml b/tasks/deploy_reverse-proxy.yml index f46dda7..1871f90 100644 --- a/tasks/deploy_reverse-proxy.yml +++ b/tasks/deploy_reverse-proxy.yml @@ -54,7 +54,7 @@ SWIFT_REGIONNAME: "{{ SWIFT_REGIONNAME }}" SWIFT_TENANTNAME: "{{ OS_TENANT_NAME }}" SWIFT_AUTHVERSION: "{{ OS_IDENTITY_API_VERSION }}" - PASSPHRASE: "{{ DUPLICITY_PASSPHRASE}}" + PASSPHRASE: "{{ duplicity_passphrase }}" # /usr/bin/duplicity uses "-s" python argument to prevent loading modules from user's python directory, # this variable will override that. PYTHONPATH: ".local/lib/python3.9/site-packages" diff --git a/tasks/mysql-server_install_from_backup_stage_1.yml b/tasks/mysql-server_install_from_backup_stage_1.yml index 284bb03..e55c80c 100644 --- a/tasks/mysql-server_install_from_backup_stage_1.yml +++ b/tasks/mysql-server_install_from_backup_stage_1.yml @@ -67,7 +67,7 @@ SWIFT_REGIONNAME: "{{ SWIFT_REGIONNAME }}" SWIFT_TENANTNAME: "{{ OS_TENANT_NAME }}" SWIFT_AUTHVERSION: "{{ OS_IDENTITY_API_VERSION }}" - PASSPHRASE: "{{ DUPLICITY_PASSPHRASE}}" + PASSPHRASE: "{{ duplicity_passphrase }}" # /usr/bin/duplicity uses "-s" python argument to prevent loading modules from user's python directory, # this variable will override that. PYTHONPATH: ".local/lib/python3.9/site-packages" diff --git a/tasks/retrieve_secret_vars.yml b/tasks/retrieve_secret_vars.yml index bdeb80e..ffa7f3f 100644 --- a/tasks/retrieve_secret_vars.yml +++ b/tasks/retrieve_secret_vars.yml @@ -90,8 +90,6 @@ dir: "{{ remote_workdir }}" - name: secrets/bootstrap/OVH_APPLICATION.yml dir: "{{ remote_workdir }}" - - name: secrets/bootstrap/duplicity_passphrase - dir: "{{ remote_workdir }}" environment: SECRETS_ARCHIVE_PASSPHRASE: "{{ lookup('env', 'SECRETS_ARCHIVE_PASSPHRASE') }}" @@ -128,7 +126,7 @@ # SWIFT_REGIONNAME: "{{ SWIFT_REGIONNAME }}" # SWIFT_TENANTNAME: "{{ OS_TENANT_NAME }}" # SWIFT_AUTHVERSION: "{{ OS_IDENTITY_API_VERSION }}" -# PASSPHRASE: "{{ DUPLICITY_PASSPHRASE}}" +# PASSPHRASE: "{{ duplicity_passphrase }}" # # /usr/bin/duplicity uses "-s" python argument to prevent loading modules from user's python directory, # # this variable will override that. # PYTHONPATH: ".local/lib/python3.9/site-packages"