From 0f223566627ef9d7e7026963c5287d27ec84d67e Mon Sep 17 00:00:00 2001 From: Jake Hutchinson Date: Tue, 3 Dec 2024 16:17:29 +0000 Subject: [PATCH] Remove image_repository creds --- etc/kayobe/ansible/pulp-host-image-download.yml | 4 ++-- etc/kayobe/ansible/pulp-host-image-promote.yml | 4 ++-- etc/kayobe/ansible/pulp-image-upload.yml | 4 ++-- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/kayobe/ansible/pulp-host-image-download.yml b/etc/kayobe/ansible/pulp-host-image-download.yml index 6b3494dfe..91fab9052 100644 --- a/etc/kayobe/ansible/pulp-host-image-download.yml +++ b/etc/kayobe/ansible/pulp-host-image-download.yml @@ -25,8 +25,8 @@ - name: Download image artifact get_url: url: "{{ stackhpc_overcloud_host_image_url_no_auth }}" - username: "{{ stackhpc_image_repository_username }}" - password: "{{ stackhpc_image_repository_password }}" + username: "{{ stackhpc_release_pulp_username }}" + password: "{{ stackhpc_release_pulp_password }}" force_basic_auth: true unredirected_headers: - "Authorization" diff --git a/etc/kayobe/ansible/pulp-host-image-promote.yml b/etc/kayobe/ansible/pulp-host-image-promote.yml index 42f98b423..f7b0a0607 100644 --- a/etc/kayobe/ansible/pulp-host-image-promote.yml +++ b/etc/kayobe/ansible/pulp-host-image-promote.yml @@ -4,8 +4,8 @@ hosts: localhost vars: remote_pulp_url: "{{ stackhpc_release_pulp_url }}" - remote_pulp_username: "{{ stackhpc_image_repository_username }}" - remote_pulp_password: "{{ stackhpc_image_repository_password }}" + remote_pulp_username: "{{ stackhpc_release_pulp_username }}" + remote_pulp_password: "{{ stackhpc_release_pulp_password }}" repository_name: "kayobe-images-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}" base_path: "kayobe-images/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}" promotion_tag: "{{ lookup('env', 'OVERCLOUD_HOST_IMAGE_TAG') }}" diff --git a/etc/kayobe/ansible/pulp-image-upload.yml b/etc/kayobe/ansible/pulp-image-upload.yml index 18079da9a..19be5f584 100644 --- a/etc/kayobe/ansible/pulp-image-upload.yml +++ b/etc/kayobe/ansible/pulp-image-upload.yml @@ -3,8 +3,8 @@ hosts: seed vars: remote_pulp_url: "{{ stackhpc_release_pulp_url }}" - remote_pulp_username: "{{ stackhpc_image_repository_username }}" - remote_pulp_password: "{{ stackhpc_image_repository_password }}" + remote_pulp_username: "{{ stackhpc_release_pulp_username }}" + remote_pulp_password: "{{ stackhpc_release_pulp_password }}" repository_name: "{{ artifact_path }}-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}" pulp_base_path: "{{ artifact_path }}/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}" file_extension: 'qcow2' diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 338b7ef66..22258a838 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -94,5 +94,5 @@ stackhpc_docker_registry_password: !vault | 3664 # Username and password of the overcloud host image repository. -stackhpc_image_repository_username: "{{ stackhpc_docker_registry_username }}" -stackhpc_image_repository_password: "{{ stackhpc_docker_registry_password }}" +stackhpc_release_pulp_username: "{{ stackhpc_docker_registry_username }}" +stackhpc_release_pulp_password: "{{ stackhpc_docker_registry_password }}"