From b4ed5c5e42da425b4e1f599b79942b8bea8c1993 Mon Sep 17 00:00:00 2001 From: Joao Victor Portal Date: Mon, 23 Aug 2021 17:30:59 -0300 Subject: [PATCH] Changed Trident secret and registry credentials Changed Trident secret name from "trident-local-registry-secret" to "default-registry-key" and got registry credentials from sysinv. Closes-Bug: 1937301 Signed-off-by: Joao Victor Portal Change-Id: I8bc236f267b878081de2a54b701a32d60175288f --- playbookconfig/src/playbooks/host_vars/netapp/default.yml | 2 +- .../playbooks/roles/common/push-docker-images/tasks/main.yml | 4 ++-- .../roles/k8s-storage-backends/netapp/tasks/main.yml | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/playbookconfig/src/playbooks/host_vars/netapp/default.yml b/playbookconfig/src/playbooks/host_vars/netapp/default.yml index 395327818..9c7a826df 100644 --- a/playbookconfig/src/playbooks/host_vars/netapp/default.yml +++ b/playbookconfig/src/playbooks/host_vars/netapp/default.yml @@ -29,7 +29,7 @@ trident_metrics_port: 8001 trident_deploy_only_on_controllers: false trident_force_reinstall: false -trident_secret_name: "trident-local-registry-secret" +trident_secret_name: "default-registry-key" # Extra parameters to be given to the tridentctl install command # If you want to configure Ipv6 add "--use-ipv6" to this list diff --git a/playbookconfig/src/playbooks/roles/common/push-docker-images/tasks/main.yml b/playbookconfig/src/playbooks/roles/common/push-docker-images/tasks/main.yml index ab10e4c14..80000a7ea 100644 --- a/playbookconfig/src/playbooks/roles/common/push-docker-images/tasks/main.yml +++ b/playbookconfig/src/playbooks/roles/common/push-docker-images/tasks/main.yml @@ -120,10 +120,10 @@ vars: script_content: | import keyring - password = keyring.get_password("CGCS", "admin") + password = keyring.get_password("sysinv", "services") if not password: raise Exception("Local registry password not found.") - print(dict(username='admin', password=str(password))) + print(dict(username='sysinv', password=str(password))) shell: "{{ script_content }}" args: executable: /usr/bin/python diff --git a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml index 3c40d89cc..47f6b6c0f 100644 --- a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml +++ b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml @@ -56,6 +56,11 @@ when: create_ns_output.rc is defined and create_ns_output.rc !=0 and create_ns_output.stderr is not search('AlreadyExists') +- name: Fail if the docker registry secret name to be used differs from default name + fail: + msg: "Trident secret name for docker registry credentials differs from default value 'default-registry-key'" + when: trident_secret_name != "default-registry-key" + - name: Check if secret exists command: kubectl -n {{ trident_namespace }} get secret {{ trident_secret_name }} environment: