From ae40227ea1f0130ef1ace200aa11504a4aada0e7 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 1 Sep 2023 15:42:27 -0400 Subject: [PATCH] Move paths and keys to defaults --- roles/base/defaults/main.yml | 7 +++++++ roles/base/tasks/main.yml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml index f1ae7cc..02efd74 100644 --- a/roles/base/defaults/main.yml +++ b/roles/base/defaults/main.yml @@ -1,4 +1,11 @@ --- +debian_main_repository: http://debian.mirror.rafal.ca/debian +debian_security_repository: http://security.debian.org + +debian_pvc_repository: https://repo.parallelvirtualcluster.org/debian +debian_pvc_signing_key_path: https://repo.parallelvirtualcluster.org/debian/bonifacelabs_signing_key.pub +debian_pvc_signing_key_id: 83D07192314835D4 + grub_cmdline: "console=tty0 console=ttyS{{ grub.serial_console[cluster_hardware].console }},115200 plymouth.ignore-serial-consoles splash" grub_serial: "serial --unit={{ grub.serial_console[cluster_hardware].console }} --speed=115200" diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index d2bba49..2e61f12 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -101,8 +101,8 @@ - name: add key for bonilan repo apt_key: - url: "https://repo.bonifacelabs.net/debian/bonifacelabs_signing_key.pub" - id: "83D07192314835D4" + url: "{{ debian_pvc_signing_key_path }}" + id: "{{ debian_pvc_signing_key_id }}" state: present register: apt_key tags: base-apt