diff --git a/inventory/group_vars/osbs-masters-stg b/inventory/group_vars/osbs-masters-stg index aa76737e38..bfb7b7a36d 100644 --- a/inventory/group_vars/osbs-masters-stg +++ b/inventory/group_vars/osbs-masters-stg @@ -12,6 +12,7 @@ openshift_schedulable: False docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org" source_registry: "registry.stg.fedoraproject.org" docker_registry: "candidate-registry.stg.fedoraproject.org" +osbs_registry_secret_name: "registry-secret" osbs_url: "osbs.stg.fedoraproject.org" osbs_koji_username: "kojibuilder_stg" diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index f4a22208b6..dd759ad9f7 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -110,6 +110,7 @@ builder_openshift_url: 'https://{{osbs_url}}', client_config_secret: 'client-config-secret', reactor_config_secret: 'reactor-config-secret', + registry_secret: 'registry-secret', token_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-stg-orchestrator', token_file: '/etc/osbs/x86-64-osbs-stg-koji', namespace: 'osbs-fedora', diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 01dac6451f..b6d96717b1 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -464,6 +464,9 @@ osbs_vendor: "{{ osbs_conf_vendor }}" osbs_readwrite_users: "{{ osbs_conf_readwrite_users }}" osbs_service_accounts: "{{ osbs_conf_service_accounts }}" + osbs_registry_uri: "https://{{ docker_registry }}/v2" + osbs_source_registry_uri: "https://{{ source_registry }}/v2" + osbs_registry_api_versions: "v2" when: env == "staging" - name: setup reactor config secret in orchestrator namespace diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2 index 7073bd99af..7db73e5843 100644 --- a/roles/osbs-client/templates/osbs.conf.j2 +++ b/roles/osbs-client/templates/osbs.conf.j2 @@ -73,6 +73,7 @@ use_auth = {{ default.use_auth }} builder_use_auth = {{ default.builder_use_auth }} distribution_scope = {{ default.distribution_scope }} registry_api_versions = {{ default.registry_api_versions }} +registry_secret = {{ default.registry_secret_name }} builder_openshift_url = {{ default.builder_openshift_url }} [scratch] @@ -140,5 +141,6 @@ use_auth = {{ default.use_auth }} builder_use_auth = {{ default.builder_use_auth }} distribution_scope = {{ default.distribution_scope }} registry_api_versions = {{ default.registry_api_versions }} +registry_secret = {{ default.registry_secret_name }} builder_openshift_url = {{ default.builder_openshift_url }} unique_tag_only = true