From bad0af72023a874cb2ea2a86a39fb5d7ff728345 Mon Sep 17 00:00:00 2001 From: Simon Ungar Felding Date: Thu, 10 Oct 2024 15:45:23 +0200 Subject: [PATCH 1/3] simplify rke2 artifact path --- README.md | 2 +- defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c29fa0bd..d0a196b2 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ rke2_data_path: /var/lib/rancher/rke2 rke2_artifact_url: https://github.com/rancher/rke2/releases/download/ # Local path to store artifacts -rke2_artifact_path: /rke2/artifact +rke2_artifact_path: /var/tmp # Airgap required artifacts rke2_artifact: diff --git a/defaults/main.yml b/defaults/main.yml index bb199792..23d59291 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -105,7 +105,7 @@ rke2_data_path: /var/lib/rancher/rke2 rke2_artifact_url: https://github.com/rancher/rke2/releases/download/ # Local path to store artifacts -rke2_artifact_path: /rke2/artifact +rke2_artifact_path: /var/tmp # Airgap required artifacts rke2_artifact: From df12e8078e57f1ab95191c371d984aeba890150d Mon Sep 17 00:00:00 2001 From: Simon Ungar Felding Date: Thu, 10 Oct 2024 15:51:12 +0200 Subject: [PATCH 2/3] also install script dir --- README.md | 2 +- defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d0a196b2..6cde727e 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ rke2_tarball_images_path: "{{ rke2_data_path }}/agent/images" rke2_architecture: amd64 # Destination directory for RKE2 installation script -rke2_install_script_dir: /var/tmp +rke2_install_script_dir: "{{ rke2_install_script_dir }}" # RKE2 channel rke2_channel: stable diff --git a/defaults/main.yml b/defaults/main.yml index 23d59291..234516da 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -136,7 +136,7 @@ rke2_tarball_images_path: "{{ rke2_data_path }}/agent/images" rke2_architecture: amd64 # Destination directory for RKE2 installation script -rke2_install_script_dir: /var/tmp +rke2_install_script_dir: "{{ rke2_install_script_dir }}" # RKE2 channel rke2_channel: stable From 76816cbd4223e44270f534e024b59aff2ec4e502 Mon Sep 17 00:00:00 2001 From: Simon Ungar Felding Date: Tue, 26 Nov 2024 15:16:44 +0100 Subject: [PATCH 3/3] fix nonsensical loop --- README.md | 2 +- defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6cde727e..cdfd00d8 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ rke2_tarball_images_path: "{{ rke2_data_path }}/agent/images" rke2_architecture: amd64 # Destination directory for RKE2 installation script -rke2_install_script_dir: "{{ rke2_install_script_dir }}" +rke2_install_script_dir: "{{ rke2_artifact_path }}" # RKE2 channel rke2_channel: stable diff --git a/defaults/main.yml b/defaults/main.yml index 234516da..f3e3b812 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -136,7 +136,7 @@ rke2_tarball_images_path: "{{ rke2_data_path }}/agent/images" rke2_architecture: amd64 # Destination directory for RKE2 installation script -rke2_install_script_dir: "{{ rke2_install_script_dir }}" +rke2_install_script_dir: "{{ rke2_artifact_path }}" # RKE2 channel rke2_channel: stable