From ae1a0c4800fc8dc434e1f303e424d2ea0675e4a8 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 19 Jun 2025 09:57:26 -0700 Subject: [PATCH] buildvm-ppc64le-osbuild: drop these for now as they are not currently needed Signed-off-by: Kevin Fenzi --- inventory/builders | 6 -- ...m-ppc64le-osbuild01.iad2.fedoraproject.org | 4 -- ...m-ppc64le-osbuild02.iad2.fedoraproject.org | 4 -- .../certgetter01.rdu3.fedoraproject.org | 9 +++ playbooks/groups/buildvm-osbuild.yml | 61 ------------------- 5 files changed, 9 insertions(+), 75 deletions(-) delete mode 100644 inventory/host_vars/buildvm-ppc64le-osbuild01.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/buildvm-ppc64le-osbuild02.iad2.fedoraproject.org create mode 100644 inventory/host_vars/certgetter01.rdu3.fedoraproject.org delete mode 100644 playbooks/groups/buildvm-osbuild.yml diff --git a/inventory/builders b/inventory/builders index 8e19db7c1b..84e45a0201 100644 --- a/inventory/builders +++ b/inventory/builders @@ -272,9 +272,3 @@ buildvm_stg buildvm_ppc64le_stg buildvm_aarch64_stg buildvm_s390x_stg - -[buildvm_osbuild_ppc64le] -buildvm-ppc64le-osbuild01.iad2.fedoraproject.org - -[buildvm_osbuild_ppc64le_staging] -buildvm-ppc64le-osbuild02.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-osbuild01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-osbuild01.iad2.fedoraproject.org deleted file mode 100644 index f3920137c2..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-osbuild01.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.38 -vmhost: bvmhost-p09-05.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildvm-ppc64le-osbuild02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-osbuild02.iad2.fedoraproject.org deleted file mode 100644 index 1891252f46..0000000000 --- a/inventory/host_vars/buildvm-ppc64le-osbuild02.iad2.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -datacenter: iad2 -eth0_ipv4_ip: 10.3.171.39 -vmhost: bvmhost-p09-05.iad2.fedoraproject.org diff --git a/inventory/host_vars/certgetter01.rdu3.fedoraproject.org b/inventory/host_vars/certgetter01.rdu3.fedoraproject.org new file mode 100644 index 0000000000..af366145e8 --- /dev/null +++ b/inventory/host_vars/certgetter01.rdu3.fedoraproject.org @@ -0,0 +1,9 @@ +--- +datacenter: iad2 +eth0_ipv4_gw: 10.16.163.254 +eth0_ipv4_ip: 10.16.163.47 +ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ +ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora +mem_size: 4096 +vmhost: vmhost-x86-04.rdu3.fedoraproject.org +volgroup: /dev/vg_guests diff --git a/playbooks/groups/buildvm-osbuild.yml b/playbooks/groups/buildvm-osbuild.yml deleted file mode 100644 index 82178c1800..0000000000 --- a/playbooks/groups/buildvm-osbuild.yml +++ /dev/null @@ -1,61 +0,0 @@ -# create a new osbuild worker - ---- -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml" - vars: - myhosts: "buildvm_osbuild_ppc64le:buildvm_osbuild_ppc64le_staging" - -- name: Make osbuild-worker - hosts: buildvm_osbuild_ppc64le:buildvm_osbuild_ppc64le_staging - user: root - gather_facts: true - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - pre_tasks: - - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - roles: - - base - - hosts - - ipa/client - - sudo - - nagios_client - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - - tasks: - - name: Set up osbuild worker - block: - - name: Create temporary file for client secret - local_action: ansible.builtin.tempfile state="file" prefix="osbuild_" - # never report this as changed to make the playbook idempotent - changed_when: false - register: client_secret_tempfile - - - name: Put secret into the temporary file - local_action: ansible.builtin.copy - content="{{ osbuild_worker_authentication_client_secret }}" - dest="{{ client_secret_tempfile.path }}" - mode="440" - # never report this as changed to make the playbook idempotent - changed_when: false - - - name: Import role to configure osbuild-worker - ansible.builtin.import_role: - name: ansible-osbuild-worker - vars: - # rest of the vars are set in the appropriate group_vars - osbuild_worker_authentication_client_secret_file: "{{ client_secret_tempfile.path }}" - - always: - - name: Remove temporary file with client secret - local_action: ansible.builtin.file path="{{ client_secret_tempfile.path }}" state=absent - # never report this as changed to make the playbook idempotent - changed_when: false - when: client_secret_tempfile is defined and client_secret_tempfile.path is defined