From ecbfdcbcb2660441cd7bbd3946581b6eb131edaf Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 17 Jan 2025 18:51:37 +0100 Subject: [PATCH] feat: add cleanup step --- .github/workflows/test.yml | 2 ++ localhost/host_vars/localhost.yml | 14 +++----------- roles/clean/defaults/main.yml | 1 + roles/clean/tasks/main.yml | 1 + roles/clean/tasks/metabase.yml | 6 ++++++ task | 17 +++++------------ 6 files changed, 18 insertions(+), 23 deletions(-) create mode 100644 roles/clean/tasks/metabase.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ced40a2..cfd9b0ac 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,6 +14,8 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' + - name: Install uv + uses: astral-sh/setup-uv@v5 - name: Run task install run: ./task install - name: Run task test diff --git a/localhost/host_vars/localhost.yml b/localhost/host_vars/localhost.yml index 903489cf..0b123239 100644 --- a/localhost/host_vars/localhost.yml +++ b/localhost/host_vars/localhost.yml @@ -7,16 +7,6 @@ hosts: - ip: 10.101.16.2 name: erp.brunner-innovation.swiss erp-dev.brunner-innovation.swiss gaia.mint-system.com -# https://registry.hub.docker.com/_/rabbitmq/ -rabbitmq_image: rabbitmq:3.8-management -rabbitmq_hostname: mq01 -rabbitmq_data_dir: "/usr/share/{{ odoo_hostname }}" -rabbitmq_ports: - - 127.0.0.1:5672:5672 - - 127.0.0.1:8080:15672 -rabbitmq_user: admin -rabbitmq_password: admin - # https://hub.docker.com/_/postgres postgres_image: postgres:14 # postgres_build_image: true # default: false @@ -70,6 +60,8 @@ nginx_http_options: | default upgrade; '' close; } +nginx_ports: + - 8080:80 nginx_proxies: - src_hostname: metabase.local dest_hostname: metabase01-prod @@ -115,5 +107,5 @@ odoo_postgres_hostname: "{{ postgres_hostname }}" metabase_image: metabase/metabase:v0.51.12.1 metabase_hostname: metabase01 metabase_db_host: postgres01 -metabase_db_user: test +metabase_db_user: example metabase_db_pass: test \ No newline at end of file diff --git a/roles/clean/defaults/main.yml b/roles/clean/defaults/main.yml index f4bd961f..4dbd1b3b 100644 --- a/roles/clean/defaults/main.yml +++ b/roles/clean/defaults/main.yml @@ -7,3 +7,4 @@ odoo_config_map: - name: prod odoo_volume_name: "{{ odoo_hostname }}" postgres_volume_name: "{{ postgres_hostname }}" +nginx_data_dir: "/usr/share/{{ nginx_hostname }}" \ No newline at end of file diff --git a/roles/clean/tasks/main.yml b/roles/clean/tasks/main.yml index a4871db2..9c08ffe8 100644 --- a/roles/clean/tasks/main.yml +++ b/roles/clean/tasks/main.yml @@ -46,3 +46,4 @@ - pgadmin - meilisearch - crowdsec + - metabase \ No newline at end of file diff --git a/roles/clean/tasks/metabase.yml b/roles/clean/tasks/metabase.yml new file mode 100644 index 00000000..64696966 --- /dev/null +++ b/roles/clean/tasks/metabase.yml @@ -0,0 +1,6 @@ +--- +- name: Remove metabase container {{ metabase_hostname }} + community.docker.docker_container: + name: "{{ metabase_hostname }}-{{ item.name}}" + state: absent + loop: "{{ metabase_config_map }}" \ No newline at end of file diff --git a/task b/task index e0739c96..a6de6913 100755 --- a/task +++ b/task @@ -154,19 +154,12 @@ function galaxy-publish() { function test() { activate-venv - ansible-playbook -i localhost plays/localhost.yml - if [ "$1" = "clean" ]; then - echo "Cleanup server" - ansible-playbook -i localhost plays/clean.yml -i odoo,odoo_data,odoo_volume,\ - postgres,postgres_data,postgres_volume,\ - rabbitmq,rabbitmq_data,rabbitmq_volume,\ - meilisearch,meilisearch_data,meilisearch_volume,\ - pgadmin,pgadmin_data,pgadmin_volume,\ - n8n,n8n_data,n8n_volume,\ - nginx,nginx_data,nginx_volume,\ - crowdsec,crowdsec_data,crowdsec_volume,\ - metabase,metabase_data,metabase_volume + echo "Cleanup localhost" + ansible-playbook -i localhost plays/clean.yml -t odoo,odoo_data,odoo_volume,postgres,postgres_data,postgres_volume,meilisearch,meilisearch_data,meilisearch_volume,pgadmin,pgadmin_data,pgadmin_volume,n8n,n8n_data,n8n_volume,nginx,nginx_data,nginx_volume,metabase,metabase_data,metabase_volume + else + echo "Setup localhost" + ansible-playbook -i localhost plays/localhost.yml --skip-tags check fi }