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

OSBS registry secret name 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:24:17 +01:00
parent b48a8732c5
commit b5ebe9590a
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
playbooks/groups/buildvm.yml
View file

@ -107,7 +107,6 @@
builder_openshift_url: 'https://{{osbs_url}}', builder_openshift_url: 'https://{{osbs_url}}',
client_config_secret: 'client-config-secret', client_config_secret: 'client-config-secret',
reactor_config_secret: 'reactor-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_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator',
token_file: '/etc/osbs/x86-64-osbs-koji', token_file: '/etc/osbs/x86-64-osbs-koji',
namespace: 'osbs-fedora', namespace: 'osbs-fedora',
@ -136,8 +135,6 @@
koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab", koji_kerberos_keytab: "FILE:/etc/krb5.osbs_{{osbs_url}}.keytab",
koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}", koji_kerberos_principal: "osbs/{{osbs_url}}@{{ipa_realm}}",
openshift_url: 'https://{{ osbs_url }}/', openshift_url: 'https://{{ osbs_url }}/',
registry_uri: 'https://{{ docker_registry }}/v2',
source_registry_uri: 'https://{{ source_registry }}/v2',
build_host: '{{ osbs_url }}', build_host: '{{ osbs_url }}',
koji_root: 'http://{{ koji_root }}', koji_root: 'http://{{ koji_root }}',
koji_hub: 'https://koji.fedoraproject.org/kojihub', koji_hub: 'https://koji.fedoraproject.org/kojihub',
@ -151,7 +148,6 @@
distribution_scope: 'private', distribution_scope: 'private',
registry_api_versions: 'v2', registry_api_versions: 'v2',
builder_openshift_url: 'https://{{osbs_url}}', 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_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-orchestrator',
token_file: '/etc/osbs/x86-64-osbs-koji', token_file: '/etc/osbs/x86-64-osbs-koji',
namespace: 'osbs-fedora', namespace: 'osbs-fedora',

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

@ -33,7 +33,7 @@ osbs_pulp_secret_name: pulpsecret
osbs_registry_api_versions: osbs_registry_api_versions:
- v1 - v1
- v2 - v2
osbs_registry_secret_name: v2-registry-dockercfg osbs_registry_secret_name: ""
osbs_registry_uri: '' 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