From 7773f3a1dfe6a5b7a670f9d72f49d1a39cb69ff4 Mon Sep 17 00:00:00 2001 From: Artur Date: Mon, 26 Aug 2024 21:49:54 +0200 Subject: [PATCH] zigbee2mqtt_device -> zigbee2mqtt_adapter --- .github/ansible/playbook-ci.yml | 2 +- roles/smarthome/defaults/main.yml | 2 +- roles/smarthome/tasks/main.yml | 4 ++-- roles/zigbee2mqtt/defaults/main.yml | 2 +- roles/zigbee2mqtt/tasks/main.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ansible/playbook-ci.yml b/.github/ansible/playbook-ci.yml index c7eff32..fe1adff 100755 --- a/.github/ansible/playbook-ci.yml +++ b/.github/ansible/playbook-ci.yml @@ -6,4 +6,4 @@ - role: "geerlingguy.docker" - role: "artyorsh.smarthome.smarthome" vars: - smarthome_zigbee_coordinator: "/dev/tty0" + smarthome_zigbee_adapter: "/dev/tty0" diff --git a/roles/smarthome/defaults/main.yml b/roles/smarthome/defaults/main.yml index 82705b8..8683a28 100644 --- a/roles/smarthome/defaults/main.yml +++ b/roles/smarthome/defaults/main.yml @@ -8,4 +8,4 @@ smarthome_user: password: "smarthome" # /dev/ttyUSB0 -smarthome_zigbee_coordinator: "" +smarthome_zigbee_adapter: "" diff --git a/roles/smarthome/tasks/main.yml b/roles/smarthome/tasks/main.yml index 453586e..f2a7dc3 100644 --- a/roles/smarthome/tasks/main.yml +++ b/roles/smarthome/tasks/main.yml @@ -13,7 +13,7 @@ mosquitto_user: "{{ smarthome_user }}" - name: "Install Zigbee2MQTT" - when: smarthome_zigbee_coordinator | length > 0 + when: smarthome_zigbee_adapter | length > 0 ansible.builtin.include_role: name: "zigbee2mqtt" vars: @@ -24,4 +24,4 @@ user: "{{ smarthome_user.name }}" password: "{{ smarthome_user.password }}" - zigbee2mqtt_device: "{{ smarthome_zigbee_coordinator }}" + zigbee2mqtt_adapter: "{{ smarthome_zigbee_adapter }}" diff --git a/roles/zigbee2mqtt/defaults/main.yml b/roles/zigbee2mqtt/defaults/main.yml index 9a4e89e..4cf4af5 100644 --- a/roles/zigbee2mqtt/defaults/main.yml +++ b/roles/zigbee2mqtt/defaults/main.yml @@ -9,4 +9,4 @@ zigbee2mqtt_env: {} zigbee2mqtt_config: {} -zigbee2mqtt_device: "" # "/dev/ttyUSB0" +zigbee2mqtt_adapter: "" # "/dev/ttyUSB0" diff --git a/roles/zigbee2mqtt/tasks/main.yml b/roles/zigbee2mqtt/tasks/main.yml index fb9fe23..b4c8ea6 100644 --- a/roles/zigbee2mqtt/tasks/main.yml +++ b/roles/zigbee2mqtt/tasks/main.yml @@ -40,7 +40,7 @@ groups: - "dialout" devices: - - "{{ zigbee2mqtt_device }}:/dev/ttyACM0" + - "{{ zigbee2mqtt_adapter }}:/dev/ttyACM0" ports: - "{{ zigbee2mqtt_port }}:8080" volumes: