diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 176925f6aa..5118fee205 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -107,7 +107,6 @@ builder_openshift_url: 'https://{{osbs_url}}', client_config_secret: 'client-config-secret', reactor_config_secret: 'reactor-config-secret', - registry_secret_name: 'v2-registry-dockercfg', token_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator', token_file: '/etc/osbs/x86-64-osbs-koji', namespace: 'osbs-fedora', @@ -136,8 +135,6 @@ koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab", koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}", openshift_url: 'https://{{ osbs_url }}/', - registry_uri: 'https://{{ docker_registry }}/v2', - source_registry_uri: 'https://{{ source_registry }}/v2', build_host: '{{ osbs_url }}', koji_root: 'http://{{ koji_root }}', koji_hub: 'https://koji.fedoraproject.org/kojihub', @@ -151,7 +148,6 @@ distribution_scope: 'private', registry_api_versions: 'v2', builder_openshift_url: 'https://{{osbs_url}}', - registry_secret_name: 'v2-registry-dockercfg', token_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator', token_file: '/etc/osbs/x86-64-osbs-koji', namespace: 'osbs-fedora', diff --git a/roles/osbs-namespace/defaults/main.yml b/roles/osbs-namespace/defaults/main.yml index bea6b75131..961119fdd1 100644 --- a/roles/osbs-namespace/defaults/main.yml +++ b/roles/osbs-namespace/defaults/main.yml @@ -33,7 +33,7 @@ osbs_pulp_secret_name: pulpsecret osbs_registry_api_versions: - v1 - v2 -osbs_registry_secret_name: v2-registry-dockercfg +osbs_registry_secret_name: "" osbs_registry_uri: '' osbs_source_registry_uri: '' osbs_build_json_dir: /usr/share/osbs