From 627358ba8bacac44266314a22e93b3a60b10fcf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A2=D0=BE=D0=BB?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9?= <124672278+armitageee@users.noreply.github.com> Date: Sat, 15 Apr 2023 10:54:03 +0300 Subject: [PATCH 1/7] Update docker-compose.yml update docker-compose --- vms/client/simulator/docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vms/client/simulator/docker-compose.yml b/vms/client/simulator/docker-compose.yml index ec2fe79..b9e08bb 100644 --- a/vms/client/simulator/docker-compose.yml +++ b/vms/client/simulator/docker-compose.yml @@ -12,13 +12,13 @@ services: image: antonaleks/data-simulator environment: - SIM_HOST=192.168.1.1 - - SIM_NAME=PIRCAHL11 - - SIM_PERIOD=10 - - SIM_TYPE=pressure + - SIM_NAME=PIRCAHL11 + - SIM_PERIOD=10 + - SIM_TYPE=pressure current_sensor: image: antonaleks/data-simulator environment: - SIM_HOST=192.168.1.1 - - SIM_NAME=A0_CURRENT - - SIM_PERIOD=1 - - SIM_TYPE=current \ No newline at end of file + - SIM_NAME=A0_CURRENT + - SIM_PERIOD=1 + - SIM_TYPE=current From ef69f4bf172b00714f7c2d5ed904b7e5135e53c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A2=D0=BE=D0=BB?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9?= Date: Sat, 13 May 2023 01:22:02 +0300 Subject: [PATCH 2/7] docker practise project --- .gitignore | 3 +- playbook/ansible.cfg | 3 + playbook/compose_down_playbook.yml | 10 ++ playbook/deploy-playbook.yml | 113 ++++++++++++++++++ playbook/group_vars/client_host | 7 ++ playbook/group_vars/gateway_host | 8 ++ playbook/group_vars/server_host | 6 + playbook/inventory.ini | 26 ++++ playbook/vms/client/00-installer-config.yaml | 9 ++ playbook/vms/client/simulator/.env | 1 + .../vms}/client/simulator/Dockerfile | 0 .../vms/client/simulator/docker-compose.yml | 24 ++++ .../vms}/client/simulator/entity/__init__.py | 0 .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 200 bytes .../entity/__pycache__/sensor.cpython-310.pyc | Bin 0 -> 2231 bytes .../vms}/client/simulator/entity/sensor.py | 0 .../vms}/client/simulator/main.py | 0 .../vms}/client/simulator/requirements.txt | 0 playbook/vms/gateway/00-installer-config.yaml | 11 ++ .../vms}/gateway/mosquitto/mosquitto.conf | 0 playbook/vms/server/00-installer-config.yaml | 9 ++ .../vms}/server/infra/docker-compose.yml | 0 .../vms}/server/infra/grafana/grafana.ini | 0 .../provisioning/dashboards/default.yaml | 0 .../grafana/provisioning/dashboards/mqtt.json | 0 .../provisioning/datasources/default.yaml | 0 .../infra/influxdb/scripts/influxdb-init.iql | 0 .../vms}/server/infra/telegraf/telegraf.conf | 0 report.md | 0 vms/client/simulator/docker-compose.yml | 24 ---- 30 files changed, 229 insertions(+), 25 deletions(-) create mode 100644 playbook/ansible.cfg create mode 100644 playbook/compose_down_playbook.yml create mode 100644 playbook/deploy-playbook.yml create mode 100644 playbook/group_vars/client_host create mode 100644 playbook/group_vars/gateway_host create mode 100644 playbook/group_vars/server_host create mode 100644 playbook/inventory.ini create mode 100644 playbook/vms/client/00-installer-config.yaml create mode 100644 playbook/vms/client/simulator/.env rename {vms => playbook/vms}/client/simulator/Dockerfile (100%) create mode 100644 playbook/vms/client/simulator/docker-compose.yml rename {vms => playbook/vms}/client/simulator/entity/__init__.py (100%) create mode 100644 playbook/vms/client/simulator/entity/__pycache__/__init__.cpython-310.pyc create mode 100644 playbook/vms/client/simulator/entity/__pycache__/sensor.cpython-310.pyc rename {vms => playbook/vms}/client/simulator/entity/sensor.py (100%) rename {vms => playbook/vms}/client/simulator/main.py (100%) rename {vms => playbook/vms}/client/simulator/requirements.txt (100%) create mode 100644 playbook/vms/gateway/00-installer-config.yaml rename {vms => playbook/vms}/gateway/mosquitto/mosquitto.conf (100%) create mode 100644 playbook/vms/server/00-installer-config.yaml rename {vms => playbook/vms}/server/infra/docker-compose.yml (100%) rename {vms => playbook/vms}/server/infra/grafana/grafana.ini (100%) rename {vms => playbook/vms}/server/infra/grafana/provisioning/dashboards/default.yaml (100%) rename {vms => playbook/vms}/server/infra/grafana/provisioning/dashboards/mqtt.json (100%) rename {vms => playbook/vms}/server/infra/grafana/provisioning/datasources/default.yaml (100%) rename {vms => playbook/vms}/server/infra/influxdb/scripts/influxdb-init.iql (100%) rename {vms => playbook/vms}/server/infra/telegraf/telegraf.conf (100%) create mode 100644 report.md delete mode 100644 vms/client/simulator/docker-compose.yml diff --git a/.gitignore b/.gitignore index 723ef36..d48c759 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea \ No newline at end of file +.idea +.vscode \ No newline at end of file diff --git a/playbook/ansible.cfg b/playbook/ansible.cfg new file mode 100644 index 0000000..ae2f3cd --- /dev/null +++ b/playbook/ansible.cfg @@ -0,0 +1,3 @@ +[defaults] +host_key_checking = False +inventory = inventory.ini \ No newline at end of file diff --git a/playbook/compose_down_playbook.yml b/playbook/compose_down_playbook.yml new file mode 100644 index 0000000..2e1bcb1 --- /dev/null +++ b/playbook/compose_down_playbook.yml @@ -0,0 +1,10 @@ +- hosts: gateway + become: yes + become_method: sudo + + + tasks: + - name: docker compose down + docker_compose: + + \ No newline at end of file diff --git a/playbook/deploy-playbook.yml b/playbook/deploy-playbook.yml new file mode 100644 index 0000000..64e45c2 --- /dev/null +++ b/playbook/deploy-playbook.yml @@ -0,0 +1,113 @@ +- hosts: gateway + become: yes + become_method: sudo + vars: + packages: + - net-tools + - docker.io + - docker-compose + + + tasks: + + - name: installing packages + ansible.builtin.apt: + pkg: "{{packages}}" + state: latest + + - name: import netplan cfg for gateway + ansible.builtin.template: + src: "{{gateway_net_src}}" + dest: "{{gateway_net_dest}}" + owner: root + group: root + mode: '0644' + + + - name: copying broker + ansible.builtin.copy: + src: "{{broker_src}}" + dest: "{{broker_dest}}" + owner: root + group: root + mode: '0644' + + +- hosts: server + become: yes + become_method: sudo + vars: + packages: + - net-tools + - python3-pip + - docker.io + - docker-compose + + tasks: + + + - name: installing pkg + ansible.builtin.apt: + pkg: "{{ packages }}" + state: latest + + - name: copying grafana and telegraf + ansible.builtin.copy: + src: "{{server_infra}}" + dest: /home/armitage/remote + owner: "{{server_user}}" + group: "{{server_user}}" + mode: '0644' + + +# - name: restarting net adapter +# shell: ifconfig enp0s8 down + + + - name: Update netplan cfg on server + ansible.builtin.template: + src: "{{server_net_src}}" + dest: "{{server_net_dest}}" + owner: root + group: root + mode: '0644' + + + - name: docker-compose up on server + docker_compose: + project_src: "{{docker_src_server}}" + + # - name: netplan apply + # shell: netplan apply + + +- hosts: client + become: yes + become_method: sudo + + tasks: + + - name: copying simulator + ansible.builtin.copy: + src: "{{simulator_src}}" + dest: "{{simulator_dest}}" + owner: "{{client_user}}" + group: "{{client_user}}" + mode: '0644' + + + - name: cfg for client host + ansible.builtin.template: + src: "{{client_cfg_src}}" + dest: "{{client_cfg_dest}}" + owner: root + group: root + mode: '0644' + + + - name: docker-compose up on client + docker_compose: + project_src: "{{docker_src_client}}" + + + diff --git a/playbook/group_vars/client_host b/playbook/group_vars/client_host new file mode 100644 index 0000000..4f69031 --- /dev/null +++ b/playbook/group_vars/client_host @@ -0,0 +1,7 @@ +--- +client_cfg_src: vms/client/00-installer-config.yaml +client_cfg_dest: /etc/netplan/00-installer-config.yaml +simulator_src: vms/client/simulator/ +simulator_dest: /home/armitage/remote +client_user: armitage +docker_src_client: /home/armitage/remote \ No newline at end of file diff --git a/playbook/group_vars/gateway_host b/playbook/group_vars/gateway_host new file mode 100644 index 0000000..46c3c5a --- /dev/null +++ b/playbook/group_vars/gateway_host @@ -0,0 +1,8 @@ +--- +gateway_net_src: vms/gateway/00-installer-config.yaml +gateway_net_dest: /etc/netplan/00-installer-config.yaml +gateway_rules_src: vms/gateway/rules.v4 +gateway_rules_dest: /etc/iptables/rules.v4 +broker_src: vms/gateway/ +broker_dest: /home/armitage/remote +gateway_user: armitage \ No newline at end of file diff --git a/playbook/group_vars/server_host b/playbook/group_vars/server_host new file mode 100644 index 0000000..7e56f1d --- /dev/null +++ b/playbook/group_vars/server_host @@ -0,0 +1,6 @@ +--- +server_net_src: vms/server/00-installer-config.yaml +server_net_dest: /etc/netplan/00-installer-config.yaml +server_infra: vms/server/infra/ +server_user: armitage +docker_src_server: /home/armitage/remote diff --git a/playbook/inventory.ini b/playbook/inventory.ini new file mode 100644 index 0000000..fa0ce8a --- /dev/null +++ b/playbook/inventory.ini @@ -0,0 +1,26 @@ +[cluster:vars] +ansible_ssh_pass = '{{my_ssh_pass}}' +ansible_sudo_pass= '{{my_cluster_sudo_pass}}' + +[cluster] +server +gateway +client + +[server_host:vars] +ansible_ssh_pass = '{{my_ssh_pass}}' +ansible_sudo_pass= '{{my_cluster_sudo_pass}}' +[server_host] +server ansible_host=192.168.0.167 ansible_ssh_user=armitage ansible_become=true StrictHostKeyChecking=no + +[gateway_host:vars] +ansible_ssh_pass = '{{my_ssh_pass}}' +ansible_sudo_pass= '{{my_cluster_sudo_pass}}' +[gateway_host] +gateway ansible_host=192.168.0.144 ansible_ssh_user=armitage ansible_become=true + +[client_host:vars] +ansible_ssh_pass = '{{my_ssh_pass}}' +ansible_sudo_pass= '{{my_cluster_sudo_pass}}' +[client_host] +client ansible_host=192.168.0.168 ansible_ssh_user=armitage ansible_become=true diff --git a/playbook/vms/client/00-installer-config.yaml b/playbook/vms/client/00-installer-config.yaml new file mode 100644 index 0000000..6dbf119 --- /dev/null +++ b/playbook/vms/client/00-installer-config.yaml @@ -0,0 +1,9 @@ +network: + ethernets: + enp0s3: + dhcp4: true + enp0s8: + dhcp4: no + addresses: [ 192.168.5.10/24 ] + gateway4: 192.168.5.1 + version: 2 \ No newline at end of file diff --git a/playbook/vms/client/simulator/.env b/playbook/vms/client/simulator/.env new file mode 100644 index 0000000..95db3d0 --- /dev/null +++ b/playbook/vms/client/simulator/.env @@ -0,0 +1 @@ +SIM_HOST_IP=192.168.0.144 \ No newline at end of file diff --git a/vms/client/simulator/Dockerfile b/playbook/vms/client/simulator/Dockerfile similarity index 100% rename from vms/client/simulator/Dockerfile rename to playbook/vms/client/simulator/Dockerfile diff --git a/playbook/vms/client/simulator/docker-compose.yml b/playbook/vms/client/simulator/docker-compose.yml new file mode 100644 index 0000000..1a75b2c --- /dev/null +++ b/playbook/vms/client/simulator/docker-compose.yml @@ -0,0 +1,24 @@ +version: "3" + +services: + temp_sensor: + image: wuwun9/simulator + environment: + - SIM_HOST=$SIM_HOST_IP + - SIM_NAME=SIM_TEMPERATURE + - SIM_PERIOD=5 + - SIM_TYPE=temperature + pressure_sensor: + image: wuwun9/simulator + environment: + - SIM_HOST=$SIM_HOST_IP + - SIM_NAME=SIM_PRESSURE + - SIM_PERIOD=10 + - SIM_TYPE=pressure + current_sensor: + image: wuwun9/simulator + environment: + - SIM_HOST=$SIM_HOST_IP + - SIM_NAME=SIM_CURRENT + - SIM_PERIOD=1 + - SIM_TYPE=current \ No newline at end of file diff --git a/vms/client/simulator/entity/__init__.py b/playbook/vms/client/simulator/entity/__init__.py similarity index 100% rename from vms/client/simulator/entity/__init__.py rename to playbook/vms/client/simulator/entity/__init__.py diff --git a/playbook/vms/client/simulator/entity/__pycache__/__init__.cpython-310.pyc b/playbook/vms/client/simulator/entity/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..aa83e3b09b20f731fb2730a9737c8615259d6b69 GIT binary patch literal 200 zcmd1j<>g`k0;50bDIoeWh(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o1Tk$aS`g2`x@7 zDvogra`fgD| zRdOWHl{Hzv&%CN^09G?AZ>z-gbXM96;(^MXBO4U|bIP0TbZ% zHXHFyn`?~5$jTg};+80>u68;;~&O32{;0ynHFZ@dB+d2r-C{+Gl*Z5%^sU-DH)E&e@+S5L0QM&IN za^PxzKXZkMk|-4dfeo5lU(3rOf3dASA)M1lzv-m@hC(S}U0IwM<`5Cm`L=m>D82^Aqss)fL}$bvOKT$#q1 zjymlc@`33jL{<}`+mnMB*9{@Q9t82^q_h+Ff;3wdB1n>68l+J#F>uRXrfp_ z(LzCimaYg45IBhDLgc? zvyvIWd%3F={|bCI;#pOQFb)jFVwQPy3qeoO+Xjd9UZ1mPd5%v@cb#l{$c~8r^B{AJ zDCfbNvJMj2>p~r;s=qV`iIZpGDI$NJ51*a4VlnSW6@3nFYs?q@6p9y7OzF*<6K6ve z$A!bhF@jLq>kF{Lh@N6ay3FAXtL4z{Qf~EmxC)%Px3w|`340GVmJ+5f;dQH%x&6s~ zeHnH%5~9hFX%Uj?FXR4mAcp4(fd9b275E@!GX^BT0KXYCCfasq_gd}GpZeE6-8}gj zA)ZHZMkgQ^Fnx)ID|~o)YQ`c3`Xzj2RyVW2z6u8~;NdGMP Date: Sat, 13 May 2023 02:50:49 +0300 Subject: [PATCH 3/7] telegraf conf changes and docker-compose up on vms --- playbook/compose_down_playbook.yml | 23 +++++++++++++++++-- playbook/deploy-playbook.yml | 23 ++++++++++++++++++- playbook/group_vars/gateway_host | 3 ++- .../vms/server/infra/telegraf/telegraf.conf | 2 +- 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/playbook/compose_down_playbook.yml b/playbook/compose_down_playbook.yml index 2e1bcb1..e52a5e5 100644 --- a/playbook/compose_down_playbook.yml +++ b/playbook/compose_down_playbook.yml @@ -1,10 +1,29 @@ -- hosts: gateway +- hosts: server + become: yes + become_method: sudo + + + tasks: + - name: docker compose down + docker_compose: + + + +- hosts: client become: yes become_method: sudo + tasks: + - name: docker compose down + docker_compose: + + +- hosts: gateway + become: yes + become_method: sudo tasks: - name: docker compose down docker_compose: - + \ No newline at end of file diff --git a/playbook/deploy-playbook.yml b/playbook/deploy-playbook.yml index 64e45c2..0604850 100644 --- a/playbook/deploy-playbook.yml +++ b/playbook/deploy-playbook.yml @@ -23,6 +23,9 @@ group: root mode: '0644' + - name: prune phase + shell: + cmd: docker images -a -q|xargs -r docker rmi -f - name: copying broker ansible.builtin.copy: @@ -33,6 +36,18 @@ mode: '0644' + - name: starting mqtt broker + docker_container: + name: broker + image: eclipse-mosquitto + state: started + ports: + - "1883:1883" + volumes: + - "{{mosquitto_src}}" + + + - hosts: server become: yes become_method: sudo @@ -72,6 +87,9 @@ group: root mode: '0644' + - name: prune phase + shell: + cmd: docker images -a -q|xargs -r docker rmi -f - name: docker-compose up on server docker_compose: @@ -104,7 +122,10 @@ group: root mode: '0644' - + - name: prune phase + shell: + cmd: docker images -a -q|xargs -r docker rmi -f + - name: docker-compose up on client docker_compose: project_src: "{{docker_src_client}}" diff --git a/playbook/group_vars/gateway_host b/playbook/group_vars/gateway_host index 46c3c5a..cd7a4e4 100644 --- a/playbook/group_vars/gateway_host +++ b/playbook/group_vars/gateway_host @@ -5,4 +5,5 @@ gateway_rules_src: vms/gateway/rules.v4 gateway_rules_dest: /etc/iptables/rules.v4 broker_src: vms/gateway/ broker_dest: /home/armitage/remote -gateway_user: armitage \ No newline at end of file +gateway_user: armitage +mosquitto_src: /home/armitage/remote/mosquitto:/mosquitto/config \ No newline at end of file diff --git a/playbook/vms/server/infra/telegraf/telegraf.conf b/playbook/vms/server/infra/telegraf/telegraf.conf index ddd8b05..690ea0a 100644 --- a/playbook/vms/server/infra/telegraf/telegraf.conf +++ b/playbook/vms/server/infra/telegraf/telegraf.conf @@ -8558,7 +8558,7 @@ password = "telegraf" # "telegraf/+/mem", # "sensors/#", # ] -servers = ["tcp://192.168.26.1:1883"] # адрес vm с mqtt-брокером +servers = ["tcp://192.168.0.144:1883"] # адрес vm с mqtt-брокером topics = [ "sensors/#" ] From 7f584ed63b76430c0be4febf87ce80352f75c7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A2=D0=BE=D0=BB?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9?= Date: Sat, 13 May 2023 15:05:35 +0300 Subject: [PATCH 4/7] Deleting old containers and images before starting --- playbook/deploy-playbook.yml | 90 ++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 14 deletions(-) diff --git a/playbook/deploy-playbook.yml b/playbook/deploy-playbook.yml index 0604850..8dc2679 100644 --- a/playbook/deploy-playbook.yml +++ b/playbook/deploy-playbook.yml @@ -23,9 +23,26 @@ group: root mode: '0644' - - name: prune phase - shell: - cmd: docker images -a -q|xargs -r docker rmi -f + - docker_host_info: + images: yes + containers: yes + register: docker_objects + + - docker_container: + name: "{{ item.Id }}" + state: absent + loop: "{{ docker_objects.containers }}" + loop_control: + label: "{{ item.Id }}" + + - docker_image: + name: item.RepoTags | first + state: absent + force_absent: yes + loop: "{{ docker_objects.images }}" + loop_control: + label: "{{ item.RepoTags | first }}" + - name: copying broker ansible.builtin.copy: @@ -47,7 +64,6 @@ - "{{mosquitto_src}}" - - hosts: server become: yes become_method: sudo @@ -60,7 +76,6 @@ tasks: - - name: installing pkg ansible.builtin.apt: pkg: "{{ packages }}" @@ -69,14 +84,14 @@ - name: copying grafana and telegraf ansible.builtin.copy: src: "{{server_infra}}" - dest: /home/armitage/remote + dest: "{{docker_src_server}}" owner: "{{server_user}}" group: "{{server_user}}" mode: '0644' -# - name: restarting net adapter -# shell: ifconfig enp0s8 down + - name: restarting net adapter + shell: ifconfig enp0s8 down - name: Update netplan cfg on server @@ -87,9 +102,25 @@ group: root mode: '0644' - - name: prune phase - shell: - cmd: docker images -a -q|xargs -r docker rmi -f + - docker_host_info: + images: yes + containers: yes + register: docker_objects + + - docker_container: + name: "{{ item.Id }}" + state: absent + loop: "{{ docker_objects.containers }}" + loop_control: + label: "{{ item.Id }}" + + - docker_image: + name: item.RepoTags | first + state: absent + force_absent: yes + loop: "{{ docker_objects.images }}" + loop_control: + label: "{{ item.RepoTags | first }}" - name: docker-compose up on server docker_compose: @@ -102,9 +133,21 @@ - hosts: client become: yes become_method: sudo + vars: + packages: + - net-tools + - python3-pip + - docker.io + - docker-compose tasks: + + - name: installing pkg + ansible.builtin.apt: + pkg: "{{ packages }}" + state: latest + - name: copying simulator ansible.builtin.copy: src: "{{simulator_src}}" @@ -113,6 +156,9 @@ group: "{{client_user}}" mode: '0644' + - name: restarting net adapter + shell: ifconfig enp0s8 down + - name: cfg for client host ansible.builtin.template: @@ -122,9 +168,25 @@ group: root mode: '0644' - - name: prune phase - shell: - cmd: docker images -a -q|xargs -r docker rmi -f + - docker_host_info: + images: yes + containers: yes + register: docker_objects + + - docker_container: + name: "{{ item.Id }}" + state: absent + loop: "{{ docker_objects.containers }}" + loop_control: + label: "{{ item.Id }}" + + - docker_image: + name: item.RepoTags | first + state: absent + force_absent: yes + loop: "{{ docker_objects.images }}" + loop_control: + label: "{{ item.RepoTags | first }}" - name: docker-compose up on client docker_compose: From a6caedd4321a8f73d2708ce6c3cea2899096edcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A2=D0=BE=D0=BB?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9?= Date: Sat, 13 May 2023 15:12:44 +0300 Subject: [PATCH 5/7] =?UTF-8?q?Playbook=20=D0=B4=D0=BB=D1=8F=20=D0=BE?= =?UTF-8?q?=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B8=20docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- playbook/compose_down_playbook.yml | 78 +++++++++++++++++++++++++++--- playbook/deploy-playbook.yml | 4 -- 2 files changed, 72 insertions(+), 10 deletions(-) diff --git a/playbook/compose_down_playbook.yml b/playbook/compose_down_playbook.yml index e52a5e5..b785dc6 100644 --- a/playbook/compose_down_playbook.yml +++ b/playbook/compose_down_playbook.yml @@ -4,8 +4,30 @@ tasks: - - name: docker compose down - docker_compose: + - name: Stopping containers + docker_container: + state: stopped + all_containers: yes + + - docker_host_info: + images: yes + containers: yes + register: docker_objects + + - docker_container: + name: "{{ item.Id }}" + state: absent + loop: "{{ docker_objects.containers }}" + loop_control: + label: "{{ item.Id }}" + + - docker_image: + name: item.RepoTags | first + state: absent + force_absent: yes + loop: "{{ docker_objects.images }}" + loop_control: + label: "{{ item.RepoTags | first }}" @@ -14,8 +36,30 @@ become_method: sudo tasks: - - name: docker compose down - docker_compose: + - name: Stopping containers + docker_container: + state: stopped + all_containers: yes + + - docker_host_info: + images: yes + containers: yes + register: docker_objects + + - docker_container: + name: "{{ item.Id }}" + state: absent + loop: "{{ docker_objects.containers }}" + loop_control: + label: "{{ item.Id }}" + + - docker_image: + name: item.RepoTags | first + state: absent + force_absent: yes + loop: "{{ docker_objects.images }}" + loop_control: + label: "{{ item.RepoTags | first }}" - hosts: gateway @@ -23,7 +67,29 @@ become_method: sudo tasks: - - name: docker compose down - docker_compose: + - name: Stopping containers + docker_container: + state: stopped + all_containers: yes + + - docker_host_info: + images: yes + containers: yes + register: docker_objects + + - docker_container: + name: "{{ item.Id }}" + state: absent + loop: "{{ docker_objects.containers }}" + loop_control: + label: "{{ item.Id }}" + + - docker_image: + name: item.RepoTags | first + state: absent + force_absent: yes + loop: "{{ docker_objects.images }}" + loop_control: + label: "{{ item.RepoTags | first }}" \ No newline at end of file diff --git a/playbook/deploy-playbook.yml b/playbook/deploy-playbook.yml index 8dc2679..47623e9 100644 --- a/playbook/deploy-playbook.yml +++ b/playbook/deploy-playbook.yml @@ -52,7 +52,6 @@ group: root mode: '0644' - - name: starting mqtt broker docker_container: name: broker @@ -89,11 +88,9 @@ group: "{{server_user}}" mode: '0644' - - name: restarting net adapter shell: ifconfig enp0s8 down - - name: Update netplan cfg on server ansible.builtin.template: src: "{{server_net_src}}" @@ -159,7 +156,6 @@ - name: restarting net adapter shell: ifconfig enp0s8 down - - name: cfg for client host ansible.builtin.template: src: "{{client_cfg_src}}" From e4c0d270e3829d0a06c4d645b921ca8af8b216b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A2=D0=BE=D0=BB?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9?= Date: Sat, 13 May 2023 15:55:50 +0300 Subject: [PATCH 6/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- playbook/compose_down_playbook.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/playbook/compose_down_playbook.yml b/playbook/compose_down_playbook.yml index b785dc6..cfdd951 100644 --- a/playbook/compose_down_playbook.yml +++ b/playbook/compose_down_playbook.yml @@ -4,10 +4,6 @@ tasks: - - name: Stopping containers - docker_container: - state: stopped - all_containers: yes - docker_host_info: images: yes @@ -30,16 +26,11 @@ label: "{{ item.RepoTags | first }}" - - hosts: client become: yes become_method: sudo tasks: - - name: Stopping containers - docker_container: - state: stopped - all_containers: yes - docker_host_info: images: yes @@ -67,10 +58,6 @@ become_method: sudo tasks: - - name: Stopping containers - docker_container: - state: stopped - all_containers: yes - docker_host_info: images: yes From 794a042a974333c0c94b0646f1d3ff94e2431739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A2=D0=BE=D0=BB?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9?= Date: Sat, 13 May 2023 21:44:08 +0300 Subject: [PATCH 7/7] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D1=81=D0=B5?= =?UTF-8?q?=D1=82=D0=B5=D0=B2=D1=8B=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- playbook/deploy-playbook.yml | 50 ++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/playbook/deploy-playbook.yml b/playbook/deploy-playbook.yml index 47623e9..1ddca89 100644 --- a/playbook/deploy-playbook.yml +++ b/playbook/deploy-playbook.yml @@ -15,13 +15,13 @@ pkg: "{{packages}}" state: latest - - name: import netplan cfg for gateway - ansible.builtin.template: - src: "{{gateway_net_src}}" - dest: "{{gateway_net_dest}}" - owner: root - group: root - mode: '0644' + # - name: import netplan cfg for gateway + # ansible.builtin.template: + # src: "{{gateway_net_src}}" + # dest: "{{gateway_net_dest}}" + # owner: root + # group: root + # mode: '0644' - docker_host_info: images: yes @@ -88,16 +88,16 @@ group: "{{server_user}}" mode: '0644' - - name: restarting net adapter - shell: ifconfig enp0s8 down + # - name: restarting net adapter + # shell: ifconfig enp0s8 down - - name: Update netplan cfg on server - ansible.builtin.template: - src: "{{server_net_src}}" - dest: "{{server_net_dest}}" - owner: root - group: root - mode: '0644' + # - name: Update netplan cfg on server + # ansible.builtin.template: + # src: "{{server_net_src}}" + # dest: "{{server_net_dest}}" + # owner: root + # group: root + # mode: '0644' - docker_host_info: images: yes @@ -153,16 +153,16 @@ group: "{{client_user}}" mode: '0644' - - name: restarting net adapter - shell: ifconfig enp0s8 down + # - name: restarting net adapter + # shell: ifconfig enp0s8 down - - name: cfg for client host - ansible.builtin.template: - src: "{{client_cfg_src}}" - dest: "{{client_cfg_dest}}" - owner: root - group: root - mode: '0644' + # - name: cfg for client host + # ansible.builtin.template: + # src: "{{client_cfg_src}}" + # dest: "{{client_cfg_dest}}" + # owner: root + # group: root + # mode: '0644' - docker_host_info: images: yes