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

Fix registry related configuration

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-04-18 14:14:45 +02:00
parent f429d744ad
commit e57f7888ad
4 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@ openshift_schedulable: False
docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org" docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org"
source_registry: "registry.stg.fedoraproject.org" source_registry: "registry.stg.fedoraproject.org"
docker_registry: "candidate-registry.stg.fedoraproject.org" docker_registry: "candidate-registry.stg.fedoraproject.org"
osbs_registry_secret_name: "registry-secret"
osbs_url: "osbs.stg.fedoraproject.org" osbs_url: "osbs.stg.fedoraproject.org"
osbs_koji_username: "kojibuilder_stg" osbs_koji_username: "kojibuilder_stg"

1
playbooks/groups/buildvm.yml
View file

@ -110,6 +110,7 @@
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: 'registry-secret',
token_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-stg-orchestrator', token_secrets: 'x86-64-osbs:/var/run/secrets/atomic-reactor/x86-64-stg-orchestrator',
token_file: '/etc/osbs/x86-64-osbs-stg-koji', token_file: '/etc/osbs/x86-64-osbs-stg-koji',
namespace: 'osbs-fedora', namespace: 'osbs-fedora',

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

@ -464,6 +464,9 @@
osbs_vendor: "{{ osbs_conf_vendor }}" 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 }}"
osbs_registry_uri: "https://{{ docker_registry }}/v2"
osbs_source_registry_uri: "https://{{ source_registry }}/v2"
osbs_registry_api_versions: "v2"
when: env == "staging" when: env == "staging"
- name: setup reactor config secret in orchestrator namespace - name: setup reactor config secret in orchestrator namespace

2
roles/osbs-client/templates/osbs.conf.j2
View file

@ -73,6 +73,7 @@ use_auth = {{ default.use_auth }}
builder_use_auth = {{ default.builder_use_auth }} builder_use_auth = {{ default.builder_use_auth }}
distribution_scope = {{ default.distribution_scope }} distribution_scope = {{ default.distribution_scope }}
registry_api_versions = {{ default.registry_api_versions }} registry_api_versions = {{ default.registry_api_versions }}
registry_secret = {{ default.registry_secret_name }}
builder_openshift_url = {{ default.builder_openshift_url }} builder_openshift_url = {{ default.builder_openshift_url }}
[scratch] [scratch]
@ -140,5 +141,6 @@ use_auth = {{ default.use_auth }}
builder_use_auth = {{ default.builder_use_auth }} builder_use_auth = {{ default.builder_use_auth }}
distribution_scope = {{ default.distribution_scope }} distribution_scope = {{ default.distribution_scope }}
registry_api_versions = {{ default.registry_api_versions }} registry_api_versions = {{ default.registry_api_versions }}
registry_secret = {{ default.registry_secret_name }}
builder_openshift_url = {{ default.builder_openshift_url }} builder_openshift_url = {{ default.builder_openshift_url }}
unique_tag_only = true unique_tag_only = true