From dab2fea58b09ef077654e1a864b85897b61c16ee Mon Sep 17 00:00:00 2001 From: Matthew McKinnon Date: Fri, 1 Nov 2024 00:06:33 +1000 Subject: [PATCH] fix: remove network proxy from pyKMS --- main.yml | 10 ++++++---- tasks/iscsi.yml | 1 + tasks/pykms.yml | 2 -- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/main.yml b/main.yml index 4673751..a73a4d5 100644 --- a/main.yml +++ b/main.yml @@ -38,6 +38,11 @@ - hosts: docker become: yes + pre_tasks: + - name: Connect iscsi + import_tasks: tasks/iscsi.yml + tags: iscsi_connect + roles: - role: docker tags: docker_install @@ -52,10 +57,7 @@ traefik_host: traefik02.comprofix.xyz tags: traefik_install tasks: - - name: Connect iSCSI - import_tasks: tasks/iscsi.yml - tags: iscsi_connect - + - name: Deploy comprofix.com website import_tasks: tasks/comprofix.com.yml tags: comprofix_install diff --git a/tasks/iscsi.yml b/tasks/iscsi.yml index e30fe2a..493ff49 100644 --- a/tasks/iscsi.yml +++ b/tasks/iscsi.yml @@ -23,6 +23,7 @@ command: iscsiadm -m session register: iscsi_sessions changed_when: false + failed_when: iscsi_sessions.rc not in [0, 21] # Allow success if the return code is 0 or 21 - name: Connect to iSCSI target command: sudo iscsiadm -m node -T "{{ target_iqn }}" -p "10.10.10.2" --login diff --git a/tasks/pykms.yml b/tasks/pykms.yml index f5a2c3c..53243eb 100644 --- a/tasks/pykms.yml +++ b/tasks/pykms.yml @@ -13,8 +13,6 @@ image: ghcr.io/py-kms-organization/py-kms:latest restart_policy: unless-stopped recreate: true - networks: - - name: proxy_network ports: - "1688:1688" env: