From f070b047c7a3107a67b5870ebc4140233509e5c3 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Fri, 30 Nov 2018 13:38:22 +0100 Subject: [PATCH] distribution_scope in osbs.conf is deprecated Signed-off-by: Clement Verna --- playbooks/groups/buildvm.yml | 4 ---- roles/osbs-client/defaults/main.yml | 1 - roles/osbs-namespace/defaults/main.yml | 1 - roles/osbs-namespace/templates/client-config-secret.conf.j2 | 1 - .../tests/files/expected-client-config-secret.conf | 3 --- 5 files changed, 10 deletions(-) diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 5e4d0882ce..eab249b24f 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -97,11 +97,9 @@ koji_hub: 'https://koji.stg.fedoraproject.org/kojihub', sources_command: 'fedpkg sources', build_type: 'prod', - authoritative_registry: 'registry.stg.fedoraproject.org', verify_ssl: true, use_auth: true, builder_use_auth: true, - distribution_scope: 'private', registry_api_versions: 'v2', builder_openshift_url: 'https://{{osbs_url}}', client_config_secret: 'client-config-secret', @@ -139,11 +137,9 @@ koji_hub: 'https://koji.fedoraproject.org/kojihub', sources_command: 'fedpkg sources', build_type: 'prod', - authoritative_registry: 'registry.fedoraproject.org', verify_ssl: true, use_auth: true, builder_use_auth: true, - distribution_scope: 'private', registry_api_versions: 'v2', builder_openshift_url: 'https://{{osbs_url}}', token_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator', diff --git a/roles/osbs-client/defaults/main.yml b/roles/osbs-client/defaults/main.yml index 43ed4857e8..d31bca1c06 100644 --- a/roles/osbs-client/defaults/main.yml +++ b/roles/osbs-client/defaults/main.yml @@ -28,7 +28,6 @@ default: verify_ssl: false use_auth: false builder_use_auth: true - distribution_scope: private registry_api_versions: v2 builder_openshift_url: https://172.17.0.1:8443/ koji_certs_secret: "" diff --git a/roles/osbs-namespace/defaults/main.yml b/roles/osbs-namespace/defaults/main.yml index b717b38588..bb752d0466 100644 --- a/roles/osbs-namespace/defaults/main.yml +++ b/roles/osbs-namespace/defaults/main.yml @@ -24,7 +24,6 @@ osbs_readwrite_users: [] osbs_orchestrator: false osbs_worker_clusters: {} -osbs_distribution_scope: public osbs_koji_hub: '' osbs_koji_root: '' osbs_pulp_registry_name: '' diff --git a/roles/osbs-namespace/templates/client-config-secret.conf.j2 b/roles/osbs-namespace/templates/client-config-secret.conf.j2 index a63908d8a5..50439bbc6c 100644 --- a/roles/osbs-namespace/templates/client-config-secret.conf.j2 +++ b/roles/osbs-namespace/templates/client-config-secret.conf.j2 @@ -13,7 +13,6 @@ verify_ssl = {{ cluster.verify_ssl | default('true') }} auto_build_node_selector = {{ cluster.auto_build_node_selector }} {% endif %} -distribution_scope = {{ osbs_distribution_scope }} # Koji integration {% if osbs_koji_hub %} diff --git a/roles/osbs-namespace/tests/files/expected-client-config-secret.conf b/roles/osbs-namespace/tests/files/expected-client-config-secret.conf index c4941c4358..7be6958f67 100644 --- a/roles/osbs-namespace/tests/files/expected-client-config-secret.conf +++ b/roles/osbs-namespace/tests/files/expected-client-config-secret.conf @@ -8,7 +8,6 @@ token_file = /var/run/secrets/atomic-reactor/minimum-orchestrator/token use_auth = true verify_ssl = false -distribution_scope = public # Koji integration koji_certs_secret = kojisecret @@ -30,8 +29,6 @@ use_auth = false verify_ssl = false auto_build_node_selector = auto_build=true -distribution_scope = public - # Koji integration koji_certs_secret = kojisecret