Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

OSBS: vendor in osbs.conf is deprecated

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-11-30 13:30:49 +01:00
parent b5ebe9590a
commit 631c77236b
6 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/osbs-masters
View file

@ -32,7 +32,6 @@ osbs_worker_service_accounts:
osbs_conf_sources_command: fedpkg sources osbs_conf_sources_command: fedpkg sources
osbs_conf_vendor: Fedora Project
osbs_orchestrator_cpu_limitrange: "95m" osbs_orchestrator_cpu_limitrange: "95m"
@ -90,7 +89,7 @@ _osbs_reactor_config_map:
api_url: "https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1/" api_url: "https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1/"
image_labels: image_labels:
vendor: "{{ osbs_conf_vendor }}" vendor: "Fedora Project"
authoritative-source-url: "{{ source_registry }}" authoritative-source-url: "{{ source_registry }}"
distribution-scope: public distribution-scope: public

3
inventory/group_vars/osbs-masters-stg
View file

@ -28,7 +28,6 @@ osbs_worker_service_accounts:
osbs_conf_sources_command: fedpkg sources osbs_conf_sources_command: fedpkg sources
osbs_conf_vendor: Fedora Project
osbs_orchestrator_cpu_limitrange: "95m" osbs_orchestrator_cpu_limitrange: "95m"
@ -99,7 +98,7 @@ _osbs_reactor_config_map:
api_url: "https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1/" api_url: "https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1/"
image_labels: image_labels:
vendor: "{{ osbs_conf_vendor }}" vendor: "Fedora Project"
authoritative-source-url: "{{ source_registry }}" authoritative-source-url: "{{ source_registry }}"
distribution-scope: public distribution-scope: public

2
playbooks/groups/buildvm.yml
View file

@ -98,7 +98,6 @@
sources_command: 'fedpkg sources', sources_command: 'fedpkg sources',
build_type: 'prod', build_type: 'prod',
authoritative_registry: 'registry.stg.fedoraproject.org', authoritative_registry: 'registry.stg.fedoraproject.org',
vendor: 'Fedora Project',
verify_ssl: true, verify_ssl: true,
use_auth: true, use_auth: true,
builder_use_auth: true, builder_use_auth: true,
@ -141,7 +140,6 @@
sources_command: 'fedpkg sources', sources_command: 'fedpkg sources',
build_type: 'prod', build_type: 'prod',
authoritative_registry: 'registry.fedoraproject.org', authoritative_registry: 'registry.fedoraproject.org',
vendor: 'Fedora Project',
verify_ssl: true, verify_ssl: true,
use_auth: true, use_auth: true,
builder_use_auth: true, builder_use_auth: true,

2
playbooks/groups/osbs-cluster.yml
View file

@ -310,7 +310,6 @@
osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}" osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}"
osbs_authoritative_registry: "{{ source_registry }}" osbs_authoritative_registry: "{{ source_registry }}"
osbs_sources_command: "{{ osbs_conf_sources_command }}" osbs_sources_command: "{{ osbs_conf_sources_command }}"
osbs_vendor: "{{ osbs_conf_vendor }}"
- name: setup ODCS secret in worker namespace - name: setup ODCS secret in worker namespace
hosts: osbs-masters-stg[0]:osbs-masters[0]:osbs-aarch64-masters-stg[0] hosts: osbs-masters-stg[0]:osbs-masters[0]:osbs-aarch64-masters-stg[0]
@ -338,7 +337,6 @@
osbs_nodeselector: "{{ osbs_orchestrator_default_nodeselector|default('') }}" osbs_nodeselector: "{{ osbs_orchestrator_default_nodeselector|default('') }}"
osbs_authoritative_registry: "{{ source_registry }}" osbs_authoritative_registry: "{{ source_registry }}"
osbs_sources_command: "{{ osbs_conf_sources_command }}" osbs_sources_command: "{{ osbs_conf_sources_command }}"
osbs_vendor: "{{ osbs_conf_vendor }}"
osbs_readwrite_users: "{{ osbs_conf_readwrite_users }}" osbs_readwrite_users: "{{ osbs_conf_readwrite_users }}"
osbs_service_accounts: "{{ osbs_conf_service_accounts }}" osbs_service_accounts: "{{ osbs_conf_service_accounts }}"
koji_use_kerberos: true koji_use_kerberos: true

2
roles/osbs-namespace/defaults/main.yml
View file

@ -38,7 +38,7 @@ osbs_registry_uri: ''
osbs_source_registry_uri: '' osbs_source_registry_uri: ''
osbs_build_json_dir: /usr/share/osbs osbs_build_json_dir: /usr/share/osbs
osbs_sources_command: fedpkg sources osbs_sources_command: fedpkg sources
osbs_vendor: Fedora Project osbs_vendor: ""
osbs_nodeselector: '' osbs_nodeselector: ''
osbs_buildroot_repository: '' osbs_buildroot_repository: ''
osbs_buildroot_imagestream: '' osbs_buildroot_imagestream: ''

3
roles/osbs-namespace/templates/client-config-secret.conf.j2
View file

@ -47,13 +47,14 @@ registry_uri = {{ osbs_registry_uri }}
source_registry_uri = {{ osbs_source_registry_uri }} source_registry_uri = {{ osbs_source_registry_uri }}
{% endif %} {% endif %}
sources_command = {{ osbs_sources_command }} sources_command = {{ osbs_sources_command }}
{% if osbs_vendor %}
vendor = {{ osbs_vendor }} vendor = {{ osbs_vendor }}
{% endif %}}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
[platform:x86_64] [platform:x86_64]
architecture = amd64 architecture = amd64
enable_v1 = true
[platform:aarch64] [platform:aarch64]
architecture = arm64 architecture = arm64