From f51bffae1918691ca5daca37ff3b7658bace7e7b Mon Sep 17 00:00:00 2001 From: djpbessems Date: Tue, 13 Jul 2021 23:17:02 +0200 Subject: [PATCH] Rebase drone image;Add variables w/ secrets --- .drone.yml | 41 +++++++++++--------------------- roles/dockerhost/tasks/main.yml | 8 +++++-- roles/mediaserver/tasks/main.yml | 7 +++--- 3 files changed, 23 insertions(+), 33 deletions(-) diff --git a/.drone.yml b/.drone.yml index f2dd0c6..022910f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,39 +3,26 @@ type: kubernetes name: mediaserver steps: -- name: Check syntax - image: plugins/ansible:1 - environment: - cifs_username: - from_secret: cifs_username - cifs_password: - from_secret: cifs_password - settings: - playbook: playbook.yml - inventory: inventory.yml - galaxy: requirements.yml - syntax_check: true - - name: Apply playbook - image: plugins/ansible:1 + image: bv11-cr01.bessems.eu/library/packer-extended + commands: + - ansible-galaxy collection install -r requirements.yml + - ansible-playbook \ + --inventory inventory.yml \ + --extra-vars "cifs_username=$${cifs_username} cifs_password=$${cifs_password}" + playbook.yml environment: cifs_username: from_secret: cifs_username cifs_password: from_secret: cifs_password - volumes: - - name: certificates - path: /certificates - settings: - playbook: playbook.yml - inventory: inventory.yml - galaxy: requirements.yml private_key: from_secret: ssh_privatekey - # vault_password: - # from_secret: ansible_vault_password +# volumes: +# - name: certificates +# path: /certificates -volumes: -- name: certificates - claim: - name: flexvolsmb-drone-certs +# volumes: +# - name: certificates +# claim: +# name: flexvolsmb-drone-certs diff --git a/roles/dockerhost/tasks/main.yml b/roles/dockerhost/tasks/main.yml index 7c25d4a..ffceef3 100644 --- a/roles/dockerhost/tasks/main.yml +++ b/roles/dockerhost/tasks/main.yml @@ -59,12 +59,16 @@ update_cache: yes allow_unauthenticated: yes name: - # - docker-ce=5:19.03.13~3-0~ubuntu-focal - # - docker-ce-cli=5:19.03.13~3-0~ubuntu-focal - docker-ce - docker-ce-cli - containerd.io +- name: Install Python Docker module + ansible.builtin.pip: + name: docker + executable: pip3 + state: latest + - name: Install Docker Compose get_url: url: https://github.com/docker/compose/releases/download/1.27.4/docker-compose-Linux-x86_64 diff --git a/roles/mediaserver/tasks/main.yml b/roles/mediaserver/tasks/main.yml index 3c2540d..b177404 100644 --- a/roles/mediaserver/tasks/main.yml +++ b/roles/mediaserver/tasks/main.yml @@ -4,7 +4,7 @@ driver: local driver_options: type: cifs - o: "username=,password=,domain=bessems.eu,file_mode=0777,dir_mode=0777,iocharset=utf8" + o: "username={{ cifs_username }},password={{ cifs_password }},domain=bessems.eu,file_mode=0777,dir_mode=0777,iocharset=utf8" device: "//192.168.11.225/{{ item.path }}" loop: - name: cifs_books @@ -28,9 +28,8 @@ volumes: - /root/containers/pvr/plex/config:/config - cifs_photos:/data/photos - - cifs_video-films:/data/movies - - cifs_video-series:/data/series - command: sleep 1d + - cifs_videos-films:/data/movies + - cifs_videos-series:/data/series register: output - ansible.builtin.debug: