From 8d6c53fe66635040513981e93a1bf819de276234 Mon Sep 17 00:00:00 2001 From: yohan <783b8c87@scimetis.net> Date: Fri, 8 Nov 2024 20:10:06 +0100 Subject: [PATCH] Use host network for SemanticScuttle containers. --- .../tasks/main.yml | 20 +++++++++---------- roles/role_deploy_registry/tasks/main.yml | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/roles/role_deploy_SemanticScuttle/tasks/main.yml b/roles/role_deploy_SemanticScuttle/tasks/main.yml index 42b0329..a7001df 100644 --- a/roles/role_deploy_SemanticScuttle/tasks/main.yml +++ b/roles/role_deploy_SemanticScuttle/tasks/main.yml @@ -42,11 +42,6 @@ path: /mnt/volumes/restore_states/scuttle_restored register: scuttle_restored_flag -- name: Create php5-fpm network - containers.podman.podman_network: - name: php5-fpm - become: true - - name: Create volumes directories ansible.builtin.file: path: "/mnt/volumes/{{ item }}" @@ -126,14 +121,19 @@ failed_when: false become: true +- name: Add php5-fpm.{{ DOMAIN }} to /etc/hosts + ansible.builtin.lineinfile: + path: "/etc/hosts" + line: "127.0.0.1 php5-fpm.{{ DOMAIN }} php5-fpm" + become: true + - name: Create apache-scuttle container containers.podman.podman_container: name: apache-scuttle image: "{{ private_registry_domain }}/apache-scuttle:72099cd4a1" state: present network: - - reverse-proxy - - php5-fpm + - host volume: - /mnt/volumes/scuttle_code/data:/var/www/html:z env: @@ -149,9 +149,7 @@ image: "{{ private_registry_domain }}/php5-fpm:f533a39b96" state: present network: - - php5-fpm - - mysqlnet - dns_search: "{{ SHORTNAME }}-sub.{{ DOMAIN }}" + - host volume: - /mnt/volumes/scuttle_code/data:/var/www/html:z - /mnt/volumes/scuttle_php5-fpm_conf/data:/etc/php5/fpm/pool.d:Z @@ -170,7 +168,7 @@ - apache-scuttle - php5-fpm -- name: Add cloud.{{ DOMAIN }} to /etc/hosts +- name: Add scuttle.{{ DOMAIN }} to /etc/hosts ansible.builtin.lineinfile: path: "/etc/hosts" line: "127.0.0.1 scuttle.{{ DOMAIN }} scuttle" diff --git a/roles/role_deploy_registry/tasks/main.yml b/roles/role_deploy_registry/tasks/main.yml index 1e36ae7..bf68c01 100644 --- a/roles/role_deploy_registry/tasks/main.yml +++ b/roles/role_deploy_registry/tasks/main.yml @@ -134,7 +134,7 @@ command: 'sh -c ''service apache2 reload''' become: true -- name: Add cloud.{{ DOMAIN }} to /etc/hosts +- name: Add registry.{{ DOMAIN }} to /etc/hosts ansible.builtin.lineinfile: path: "/etc/hosts" line: "127.0.0.1 registry.{{ DOMAIN }} registry"