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

distribution_scope 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:38:22 +01:00
parent 78ba5f8d9e
commit f070b047c7
5 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
playbooks/groups/buildvm.yml
View file

@ -97,11 +97,9 @@
koji_hub: 'https://koji.stg.fedoraproject.org/kojihub', koji_hub: 'https://koji.stg.fedoraproject.org/kojihub',
sources_command: 'fedpkg sources', sources_command: 'fedpkg sources',
build_type: 'prod', build_type: 'prod',
authoritative_registry: 'registry.stg.fedoraproject.org',
verify_ssl: true, verify_ssl: true,
use_auth: true, use_auth: true,
builder_use_auth: true, builder_use_auth: true,
distribution_scope: 'private',
registry_api_versions: 'v2', registry_api_versions: 'v2',
builder_openshift_url: 'https://{{osbs_url}}', builder_openshift_url: 'https://{{osbs_url}}',
client_config_secret: 'client-config-secret', client_config_secret: 'client-config-secret',
@ -139,11 +137,9 @@
koji_hub: 'https://koji.fedoraproject.org/kojihub', koji_hub: 'https://koji.fedoraproject.org/kojihub',
sources_command: 'fedpkg sources', sources_command: 'fedpkg sources',
build_type: 'prod', build_type: 'prod',
authoritative_registry: 'registry.fedoraproject.org',
verify_ssl: true, verify_ssl: true,
use_auth: true, use_auth: true,
builder_use_auth: true, builder_use_auth: true,
distribution_scope: 'private',
registry_api_versions: 'v2', registry_api_versions: 'v2',
builder_openshift_url: 'https://{{osbs_url}}', builder_openshift_url: 'https://{{osbs_url}}',
token_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator', token_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator',

1
roles/osbs-client/defaults/main.yml
View file

@ -28,7 +28,6 @@ default:
verify_ssl: false verify_ssl: false
use_auth: false use_auth: false
builder_use_auth: true builder_use_auth: true
distribution_scope: private
registry_api_versions: v2 registry_api_versions: v2
builder_openshift_url: https://172.17.0.1:8443/ builder_openshift_url: https://172.17.0.1:8443/
koji_certs_secret: "" koji_certs_secret: ""

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

@ -24,7 +24,6 @@ osbs_readwrite_users: []
osbs_orchestrator: false osbs_orchestrator: false
osbs_worker_clusters: {} osbs_worker_clusters: {}
osbs_distribution_scope: public
osbs_koji_hub: '' osbs_koji_hub: ''
osbs_koji_root: '' osbs_koji_root: ''
osbs_pulp_registry_name: '' osbs_pulp_registry_name: ''

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

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

3
roles/osbs-namespace/tests/files/expected-client-config-secret.conf
View file

@ -8,7 +8,6 @@ token_file = /var/run/secrets/atomic-reactor/minimum-orchestrator/token
use_auth = true use_auth = true
verify_ssl = false verify_ssl = false
distribution_scope = public
# Koji integration # Koji integration
koji_certs_secret = kojisecret koji_certs_secret = kojisecret
@ -30,8 +29,6 @@ use_auth = false
verify_ssl = false verify_ssl = false
auto_build_node_selector = auto_build=true auto_build_node_selector = auto_build=true
distribution_scope = public
# Koji integration # Koji integration
koji_certs_secret = kojisecret koji_certs_secret = kojisecret