Simplify code.

This commit is contained in:
yohan 2023-10-22 10:32:14 +02:00
parent 8306314aad
commit 2476a29ce1
3 changed files with 18 additions and 24 deletions

View File

@ -2,7 +2,9 @@
- name: Register variable {{ item }} - name: Register variable {{ item }}
shell: . {{ shell_script }} && echo ${{ item }} shell: . {{ shell_script }} && echo ${{ item }}
register: output_var register: output_var
changed_when: false
- name: Set variable {{ item }} - name: Set variable {{ item }}
set_fact: set_fact:
"{{ item }}": "{{ output_var.stdout }}" "{{ item }}": "{{ output_var.stdout }}"
changed_when: false

View File

@ -1,24 +1,11 @@
--- ---
- name: Assert extra-vars are set - name: Assert environment variable is not empty
ansible.builtin.assert: ansible.builtin.include_tasks: "tasks/assert_env_var_not_empty.yml"
that: with_items: "{{ PLAYBOOK_REQUIRED_ENV_VARS }}"
- item | length > 0
msg: "{{ item }} environment variable must be set"
with_items:
- KEY
- DOC_KEY
- DUPLICITY_PASSPHRASE
- SCRIPT
- name: Assert SECRETS_ARCHIVE_PASSPHRASE environment variable is set
ansible.builtin.assert:
that:
- lookup('env','SECRETS_ARCHIVE_PASSPHRASE') | length > 0
msg: "SECRETS_ARCHIVE_PASSPHRASE environment variable must be set"
- name: Download secrets.tar.gz.enc - name: Download secrets.tar.gz.enc
ansible.builtin.get_url: ansible.builtin.get_url:
url: "https://{{ CLOUD_SERVER }}/s/{{ KEY }}/download?path=%2F&files=secrets.tar.gz.enc" url: "https://{{ CLOUD_SERVER }}/s/{{ lookup('env','KEY') }}/download?path=%2F&files=secrets.tar.gz.enc"
dest: /root/secrets.tar.gz.enc dest: /root/secrets.tar.gz.enc
- name: Install openssh-client - name: Install openssh-client
@ -267,10 +254,10 @@
OS_USERNAME: "{{ OS_USERNAME }}" OS_USERNAME: "{{ OS_USERNAME }}"
OS_PASSWORD: "{{ OS_PASSWORD }}" OS_PASSWORD: "{{ OS_PASSWORD }}"
OS_REGION_NAME: "{{ OS_SWIFT_REGION_NAME }}" OS_REGION_NAME: "{{ OS_SWIFT_REGION_NAME }}"
KEY: "{{ KEY }}" KEY: "{{ lookup('env','KEY') }}"
DOC_KEY: "{{ DOC_KEY }}" DOC_KEY: "{{ lookup('env','DOC_KEY') }}"
SECRETS_ARCHIVE_PASSPHRASE: "{{ lookup('env','SECRETS_ARCHIVE_PASSPHRASE') }}" SECRETS_ARCHIVE_PASSPHRASE: "{{ lookup('env','SECRETS_ARCHIVE_PASSPHRASE') }}"
DUPLICITY_PASSPHRASE: "{{ DUPLICITY_PASSPHRASE }}" DUPLICITY_PASSPHRASE: "{{ lookup('env','DUPLICITY_PASSPHRASE') }}"
remote_user: "{{ user }}" remote_user: "{{ user }}"
delegate_to: 172.17.0.1 delegate_to: 172.17.0.1
become: true become: true

View File

@ -1,13 +1,10 @@
user: centos user: centos
CLOUD_SERVER: cloud.scimetis.net CLOUD_SERVER: cloud.scimetis.net
GIT_SERVER: git.scimetis.net GIT_SERVER: git.scimetis.net
KEY: "{{ lookup('env','KEY') }}"
DOC_KEY: "{{ lookup('env','DOC_KEY') }}"
DUPLICITY_PASSPHRASE: "{{ lookup('env','DUPLICITY_PASSPHRASE') }}"
SCRIPT: "{{ lookup('env','SCRIPT') }}"
OS_SWIFT_REGION_NAME: GRA OS_SWIFT_REGION_NAME: GRA
WORKDIR: /mnt/volumes/tmp_duplicity_workdir/data WORKDIR: /mnt/volumes/tmp_duplicity_workdir/data
ARCHIVE_DIR: /mnt/volumes/duplicity_cache/data ARCHIVE_DIR: /mnt/volumes/duplicity_cache/data
BOOTSTRAP_REPOS: BOOTSTRAP_REPOS:
- docker-nextcloud-stack - docker-nextcloud-stack
- docker-reverse-proxy-stack - docker-reverse-proxy-stack
@ -16,6 +13,7 @@ BOOTSTRAP_REPOS:
- docker-mysql-stack - docker-mysql-stack
- docker-mysql - docker-mysql
- systemd-mount-cinder-volume - systemd-mount-cinder-volume
BOOTSTRAP_REQUIRED_ENV_VARS: BOOTSTRAP_REQUIRED_ENV_VARS:
- OS_AUTH_URL - OS_AUTH_URL
- OS_IDENTITY_API_VERSION - OS_IDENTITY_API_VERSION
@ -27,6 +25,13 @@ BOOTSTRAP_REQUIRED_ENV_VARS:
- DUPLICITY_PASSPHRASE - DUPLICITY_PASSPHRASE
- KEY - KEY
- DOC_KEY - DOC_KEY
PLAYBOOK_REQUIRED_ENV_VARS:
- KEY
- DOC_KEY
- SECRETS_ARCHIVE_PASSPHRASE
- DUPLICITY_PASSPHRASE
DUPLICITY_ENVIRONMENT: DUPLICITY_ENVIRONMENT:
SWIFT_AUTHURL: "{{ lookup('env','OS_AUTH_URL') }}" SWIFT_AUTHURL: "{{ lookup('env','OS_AUTH_URL') }}"
SWIFT_AUTHVERSION: "{{ lookup('env','OS_IDENTITY_API_VERSION') }}" SWIFT_AUTHVERSION: "{{ lookup('env','OS_IDENTITY_API_VERSION') }}"