From f57315e0f1431f008ee4b7c2c285b50cdcfabd50 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 14 May 2018 12:07:28 +0200 Subject: [PATCH] Declare the registry secret name only in the playbook Signed-off-by: Clement Verna --- inventory/group_vars/buildvm | 1 - inventory/group_vars/buildvm-stg | 1 - inventory/group_vars/osbs-masters-stg | 2 -- roles/osbs-client/defaults/main.yml | 1 - 4 files changed, 5 deletions(-) diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm index a4ad9c9654..f3ee8a5cb7 100644 --- a/inventory/group_vars/buildvm +++ b/inventory/group_vars/buildvm @@ -39,4 +39,3 @@ docker_registry: "candidate-registry.fedoraproject.org" source_registry: "registry.fedoraproject.org" koji_root: "koji.fedoraproject.org/koji" koji_hub: "koji.fedoraproject.org/kojihub" -registry_secret_name: 'registry-secret' diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg index 8449dd1a21..184648a3c4 100644 --- a/inventory/group_vars/buildvm-stg +++ b/inventory/group_vars/buildvm-stg @@ -45,4 +45,3 @@ source_registry: "registry.stg.fedoraproject.org" docker_registry: "candidate-registry.stg.fedoraproject.org" koji_root: "koji.stg.fedoraproject.org/koji" koji_hub: "koji.stg.fedoraproject.org/kojihub" -registry_secret_name: 'registry-secret' diff --git a/inventory/group_vars/osbs-masters-stg b/inventory/group_vars/osbs-masters-stg index 4105688413..652365a88d 100644 --- a/inventory/group_vars/osbs-masters-stg +++ b/inventory/group_vars/osbs-masters-stg @@ -44,8 +44,6 @@ osbs_conf_readwrite_users: - "system:serviceaccount:{{ osbs_namespace }}:default" - "system:serviceaccount:{{ osbs_namespace }}:builder" -osbs_registry_secret_name: "registry-secret" - osbs_conf_worker_clusters: x86_64: - name: x86_64-stg diff --git a/roles/osbs-client/defaults/main.yml b/roles/osbs-client/defaults/main.yml index 7c5611e4dc..32c72046a7 100644 --- a/roles/osbs-client/defaults/main.yml +++ b/roles/osbs-client/defaults/main.yml @@ -39,4 +39,3 @@ default: use_kerberos: false kerberos_keytab: "" kerberos_principal: "" - registry_secret_name: 'registry-secret'