From 25605c2e4bb3d2645334be0feeffa443b5d2ef9d Mon Sep 17 00:00:00 2001 From: Athen-Player1 Date: Wed, 12 Mar 2025 16:10:09 +0000 Subject: [PATCH 1/4] removing tv and adding rustdeskclient install roles --- .../defaults/main.yml | 4 ++-- .../tasks/main.yml | 17 +++++------------ .../hand-e/docker-deploy/deploy/tasks/main.yml | 4 ++-- .../hand-e/server/deploy/tasks/main.yml | 4 ++-- .../teleop/server/deploy/tasks/main.yml | 4 ++-- 5 files changed, 13 insertions(+), 20 deletions(-) rename ansible/roles/installation/{teamviewer => shadow-support}/defaults/main.yml (75%) rename ansible/roles/installation/{teamviewer => shadow-support}/tasks/main.yml (67%) diff --git a/ansible/roles/installation/teamviewer/defaults/main.yml b/ansible/roles/installation/shadow-support/defaults/main.yml similarity index 75% rename from ansible/roles/installation/teamviewer/defaults/main.yml rename to ansible/roles/installation/shadow-support/defaults/main.yml index 7dc4c91c5..b815336d1 100644 --- a/ansible/roles/installation/teamviewer/defaults/main.yml +++ b/ansible/roles/installation/shadow-support/defaults/main.yml @@ -13,5 +13,5 @@ # with this program. If not, see . --- -teamviewer_package_url: "https://download.teamviewer.com/download/linux/teamviewer_amd64.deb" -teamviewer_package_dest: "/tmp/teamviewer_amd64.deb" +shadow-support_package_url: "https://s3.eu-west-2.amazonaws.com/com.shadowrobot.eu-west-2.public/Shadow-Support-Binary/shadow-support-x86_64_external.deb" +shadow-support_package_dest: "/tmp/shadow-support.deb" diff --git a/ansible/roles/installation/teamviewer/tasks/main.yml b/ansible/roles/installation/shadow-support/tasks/main.yml similarity index 67% rename from ansible/roles/installation/teamviewer/tasks/main.yml rename to ansible/roles/installation/shadow-support/tasks/main.yml index 0b1302e48..bc59d51fd 100644 --- a/ansible/roles/installation/teamviewer/tasks/main.yml +++ b/ansible/roles/installation/shadow-support/tasks/main.yml @@ -12,21 +12,14 @@ # You should have received a copy of the GNU General Public License along # with this program. If not, see . ---- -- name: Install libminizip1 package (Dependency for TeamViewer) - become: true - apt: - name: libminizip1 - state: present -- name: Download TeamViewer package +- name: Download shadow-support package get_url: - url: "{{ teamviewer_package_url }}" - dest: "{{ teamviewer_package_dest }}" + url: "{{ shadow-support_package_url }}" + dest: "{{ shadow-support_package_dest }}" -- name: Install TeamViewer package +- name: Install shadow-support package become: true apt: - deb: "{{ teamviewer_package_dest }}" + deb: "{{ shadow-support_package_dest }}" state: present - diff --git a/ansible/roles/products/hand-e/docker-deploy/deploy/tasks/main.yml b/ansible/roles/products/hand-e/docker-deploy/deploy/tasks/main.yml index 52877df88..00276389e 100644 --- a/ansible/roles/products/hand-e/docker-deploy/deploy/tasks/main.yml +++ b/ansible/roles/products/hand-e/docker-deploy/deploy/tasks/main.yml @@ -60,9 +60,9 @@ name: docker/aws when: use_aws|bool -- name: Include installation/teamviewer role +- name: Include installation/shadowsupport role include_role: - name: installation/teamviewer + name: installation/shadowsupport - name: Include docker-deploy/desktop-icons role include_role: diff --git a/ansible/roles/products/hand-e/server/deploy/tasks/main.yml b/ansible/roles/products/hand-e/server/deploy/tasks/main.yml index b5d7c1887..89ae469b4 100644 --- a/ansible/roles/products/hand-e/server/deploy/tasks/main.yml +++ b/ansible/roles/products/hand-e/server/deploy/tasks/main.yml @@ -194,6 +194,6 @@ mode: '755' when: upgrade_check|bool -- name: Include installation/teamviewer role +- name: Include installation/shadow-support role include_role: - name: installation/teamviewer + name: installation/shadow-support diff --git a/ansible/roles/products/teleop/server/deploy/tasks/main.yml b/ansible/roles/products/teleop/server/deploy/tasks/main.yml index 57a5ccd07..6bb2ebd61 100644 --- a/ansible/roles/products/teleop/server/deploy/tasks/main.yml +++ b/ansible/roles/products/teleop/server/deploy/tasks/main.yml @@ -229,6 +229,6 @@ mode: '755' when: upgrade_check|bool -- name: Include installation/teamviewer role +- name: Include installation/shadow-support role include_role: - name: installation/teamviewer \ No newline at end of file + name: installation/shadow-support \ No newline at end of file From 54f766bb34825d3bfc157f8f6267accd45ddda9d Mon Sep 17 00:00:00 2001 From: Athen-Player1 Date: Wed, 12 Mar 2025 16:12:42 +0000 Subject: [PATCH 2/4] readme update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 16c84e313..30c79dea5 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ * [Products](#products) * [Common](#common) + # Other useful pages - [Aurora Development Page](/docs/development.md) - [Molecule Docker Page](/docs/molecule_dockers.md) @@ -73,7 +74,6 @@ To begin with, the teleop_deploy playbook checks the installation status of dock You will first need to ensure that you have entered your customer_key into the one liner (used to pull the docker images), then a sudo_password (i.e. the password of the user with sudo permissions) for the laptop you are using to run this playbook, and also for the Vault password, which is provided by Shadow. -Open a terminal with Ctrl+Alt+T and run: ```bash bash <(curl -Ls https://raw.githubusercontent.com/shadow-robot/aurora/{release_tag}}/bin/run-ansible.sh) teleop_deploy --branch {release_tag} --inventory name_of_inventory --read-secure customer_key option1=value1 option2=value2 option3=value3 From 4560303b8a24e3a1b479009a1eb21b81faedabcb Mon Sep 17 00:00:00 2001 From: Athen-Player1 Date: Wed, 12 Mar 2025 16:24:42 +0000 Subject: [PATCH 3/4] updating install_software.yml --- ansible/playbooks/install_software.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/playbooks/install_software.yml b/ansible/playbooks/install_software.yml index 8e6c369b9..6e5937574 100644 --- a/ansible/playbooks/install_software.yml +++ b/ansible/playbooks/install_software.yml @@ -46,4 +46,4 @@ - {role: installation/mongodb, when: "'mongodb' in software_list"} - {role: installation/warehouse_ros, when: "'warehouse_ros' in software_list"} - {role: installation/production_tools, when: "'production_tools' in software_list"} - - {role: installation/teamviewer, when: "'teamviewer' in software_list"} + - {role: installation/shadow-support, when: "'shadow-support' in software_list"} From 52ea37fb6039d927b2c71a0a0e8232ba90fe12ca Mon Sep 17 00:00:00 2001 From: George E-Green <112101154+Athen-Player1@users.noreply.github.com> Date: Fri, 14 Mar 2025 15:33:46 +0000 Subject: [PATCH 4/4] fixing readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 30c79dea5..6609743d8 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,7 @@ To begin with, the teleop_deploy playbook checks the installation status of dock You will first need to ensure that you have entered your customer_key into the one liner (used to pull the docker images), then a sudo_password (i.e. the password of the user with sudo permissions) for the laptop you are using to run this playbook, and also for the Vault password, which is provided by Shadow. +Open a terminal with Ctrl+Alt+T and run: ```bash bash <(curl -Ls https://raw.githubusercontent.com/shadow-robot/aurora/{release_tag}}/bin/run-ansible.sh) teleop_deploy --branch {release_tag} --inventory name_of_inventory --read-secure customer_key option1=value1 option2=value2 option3=value3