From 5e689f64467289f231c1b966a06bc7fe98f79541 Mon Sep 17 00:00:00 2001 From: amc-nu Date: Wed, 24 Jul 2024 19:29:40 +0900 Subject: [PATCH] reorder tasks order Signed-off-by: amc-nu --- ansible/roles/ros2/tasks/main.yaml | 11 ++--------- ansible/setup.yaml | 12 ++++++------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ansible/roles/ros2/tasks/main.yaml b/ansible/roles/ros2/tasks/main.yaml index 423bf2a..77a2576 100644 --- a/ansible/roles/ros2/tasks/main.yaml +++ b/ansible/roles/ros2/tasks/main.yaml @@ -269,23 +269,16 @@ - name: Upgrade CMake block: # Follow drirections here: https://apt.kitware.com/ + - name: "{{ block_name }}: update gpg key" + shell: wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null - name: "{{ block_name }}: update repository info" ansible.builtin.apt_repository: repo: deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ {{ ansible_distribution_release }} main filename: kitware - - name: "{{ block_name }}: delete gpg key" - ansible.builtin.file: - path: /usr/share/keyrings/kitware-archive-keyring.gpg - state: absent - - name: "{{ block_name }}: update gpg key" - shell: wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null - name: "{{ block_name }}: apt update" ansible.builtin.apt: update_cache: true state: present - - name: "{{ block_name }}: install kitware-archive-keyring" - ansible.builtin.apt: - name: kitware-archive-keyring - name: "{{ block_name }}: install newer cmake" ansible.builtin.apt: name: cmake diff --git a/ansible/setup.yaml b/ansible/setup.yaml index a1f903f..e04aefb 100644 --- a/ansible/setup.yaml +++ b/ansible/setup.yaml @@ -20,6 +20,12 @@ private: false roles: - role: artifacts + - role: ptp4l_client + when: prompt_configure_network == 'y' + - role: enlarge_txqueue + when: prompt_configure_network == 'y' + - role: netplan + when: prompt_configure_network == 'y' - role: autoware - role: cuda - role: cyclonedds @@ -29,9 +35,3 @@ - role: tier4_hdr_camera_driver when: prompt_install_camera_driver == 'y' - role: ros2 - - role: ptp4l_client - when: prompt_configure_network == 'y' - - role: enlarge_txqueue - when: prompt_configure_network == 'y' - - role: netplan - when: prompt_configure_network == 'y'