OSBS: authoritative_registry in osbs.conf is deprecated

Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-11-30 13:35:03 +01:00
parent 631c77236b
commit 78ba5f8d9e
6 changed files with 1 additions and 10 deletions

View file

@ -308,7 +308,6 @@
osbs_namespace: "{{ osbs_worker_namespace }}"
osbs_service_accounts: "{{ osbs_worker_service_accounts }}"
osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}"
osbs_authoritative_registry: "{{ source_registry }}"
osbs_sources_command: "{{ osbs_conf_sources_command }}"
- name: setup ODCS secret in worker namespace
@ -335,7 +334,6 @@
osbs_worker_clusters: "{{ osbs_conf_worker_clusters }}"
osbs_cpu_limitrange: "{{ osbs_orchestrator_cpu_limitrange }}"
osbs_nodeselector: "{{ osbs_orchestrator_default_nodeselector|default('') }}"
osbs_authoritative_registry: "{{ source_registry }}"
osbs_sources_command: "{{ osbs_conf_sources_command }}"
osbs_readwrite_users: "{{ osbs_conf_readwrite_users }}"
osbs_service_accounts: "{{ osbs_conf_service_accounts }}"

View file

@ -23,7 +23,6 @@ default:
build_type: prod
registry_uri: https://osbs.localdomain:5000/v2
source_registry_uri: https://osbs.localdomain:5000/v2
authoritative_registry: registry.example.com
vendor: Fedora Project
build_host: osbs.localdomain
verify_ssl: false
@ -45,4 +44,4 @@ default:
builder_odcs_openidc_secret: ""
builder_pdc_url: ""
builder_pdc_insecure: true
flatpak_base_image: ""
flatpak_base_image: ""

View file

@ -68,7 +68,6 @@ sources_command = {{ default.sources_command }}
build_type = {{ default.build_type }}
registry_uri = {{ default.registry_uri }}
source_registry_uri = {{ default.source_registry_uri }}
authoritative_registry = {{ default.authoritative_registry }}
vendor = {{ default.vendor }}
build_host = {{ default.build_host }}
verify_ssl = {{ default.verify_ssl }}
@ -162,7 +161,6 @@ sources_command = {{ default.sources_command }}
build_type = {{ default.build_type }}
registry_uri = {{ default.registry_uri }}
source_registry_uri = {{ default.source_registry_uri }}
authoritative_registry = {{ default.authoritative_registry }}
vendor = {{ default.vendor }}
build_host = {{ default.build_host }}
verify_ssl = {{ default.verify_ssl }}

View file

@ -25,7 +25,6 @@ osbs_orchestrator: false
osbs_worker_clusters: {}
osbs_distribution_scope: public
osbs_authoritative_registry: registry.fedoraproject.org
osbs_koji_hub: ''
osbs_koji_root: ''
osbs_pulp_registry_name: ''

View file

@ -13,7 +13,6 @@ verify_ssl = {{ cluster.verify_ssl | default('true') }}
auto_build_node_selector = {{ cluster.auto_build_node_selector }}
{% endif %}
authoritative_registry = {{ osbs_authoritative_registry }}
distribution_scope = {{ osbs_distribution_scope }}
# Koji integration

View file

@ -8,7 +8,6 @@ token_file = /var/run/secrets/atomic-reactor/minimum-orchestrator/token
use_auth = true
verify_ssl = false
authoritative_registry = registry.fedoraproject.org
distribution_scope = public
# Koji integration
@ -31,7 +30,6 @@ use_auth = false
verify_ssl = false
auto_build_node_selector = auto_build=true
authoritative_registry = registry.fedoraproject.org
distribution_scope = public
# Koji integration