| |
@@ -10,14 +10,14 @@
|
| |
- name: Setup releng compose hosts
|
| |
hosts: releng_compose:releng_compose_stg
|
| |
user: root
|
| |
- gather_facts: True
|
| |
+ gather_facts: true
|
| |
tags:
|
| |
- - releng-compose
|
| |
+ - releng-compose
|
| |
|
| |
vars_files:
|
| |
- - /srv/web/infra/ansible/vars/global.yml
|
| |
- - "/srv/private/ansible/vars.yml"
|
| |
- - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
| |
+ - /srv/web/infra/ansible/vars/global.yml
|
| |
+ - "/srv/private/ansible/vars.yml"
|
| |
+ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
| |
|
| |
pre_tasks:
|
| |
- import_tasks: "{{ tasks_path }}/yumrepos.yml"
|
| |
@@ -28,7 +28,7 @@
|
| |
- ipa/client
|
| |
- rkhunter
|
| |
- nagios_client
|
| |
- - {role: zabbix/zabbix_agent, when: env == "staging"}
|
| |
+ - role: zabbix/zabbix_agent
|
| |
- collectd/base
|
| |
- sudo
|
| |
- role: keytab/service
|
| |
@@ -137,36 +137,36 @@
|
| |
|
| |
- {
|
| |
role: "push-container-registry",
|
| |
- cert_dest_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org",
|
| |
- cert_src: "{{private}}/files/docker-registry/staging/pki/issued/containerstable.crt",
|
| |
- key_src: "{{private}}/files/docker-registry/staging/pki/private/containerstable.key",
|
| |
+ cert_dest_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org",
|
| |
+ cert_src: "{{private}}/files/docker-registry/staging/pki/issued/containerstable.crt",
|
| |
+ key_src: "{{private}}/files/docker-registry/staging/pki/private/containerstable.key",
|
| |
}
|
| |
- {
|
| |
role: "push-container-registry",
|
| |
- cert_dest_dir: "/etc/docker/certs.d/registry.fedoraproject.org",
|
| |
- cert_src: "{{private}}/files/docker-registry/{{env}}/pki/issued/containerstable.crt",
|
| |
- key_src: "{{private}}/files/docker-registry/{{env}}/pki/private/containerstable.key",
|
| |
+ cert_dest_dir: "/etc/docker/certs.d/registry.fedoraproject.org",
|
| |
+ cert_src: "{{private}}/files/docker-registry/{{env}}/pki/issued/containerstable.crt",
|
| |
+ key_src: "{{private}}/files/docker-registry/{{env}}/pki/private/containerstable.key",
|
| |
when: env == "production"
|
| |
}
|
| |
- {
|
| |
role: login-registry,
|
| |
- candidate_registry: "candidate-registry.stg.fedoraproject.org",
|
| |
- candidate_registry_osbs_username: "{{candidate_registry_osbs_stg_username}}",
|
| |
- candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}",
|
| |
+ candidate_registry: "candidate-registry.stg.fedoraproject.org",
|
| |
+ candidate_registry_osbs_username: "{{candidate_registry_osbs_stg_username}}",
|
| |
+ candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}",
|
| |
when: env == "staging"
|
| |
}
|
| |
- {
|
| |
role: login-registry,
|
| |
- candidate_registry: "candidate-registry.fedoraproject.org",
|
| |
- candidate_registry_osbs_username: "{{candidate_registry_osbs_prod_username}}",
|
| |
- candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_password}}",
|
| |
+ candidate_registry: "candidate-registry.fedoraproject.org",
|
| |
+ candidate_registry_osbs_username: "{{candidate_registry_osbs_prod_username}}",
|
| |
+ candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_password}}",
|
| |
when: env == "production"
|
| |
}
|
| |
- {
|
| |
role: login-registry,
|
| |
- candidate_registry: "quay.io",
|
| |
- candidate_registry_osbs_username: "{{quay_io_username}}",
|
| |
- candidate_registry_osbs_password: "{{quay_io_password}}",
|
| |
+ candidate_registry: "quay.io",
|
| |
+ candidate_registry_osbs_username: "{{quay_io_username}}",
|
| |
+ candidate_registry_osbs_password: "{{quay_io_password}}",
|
| |
when: env == "production"
|
| |
}
|
| |
|
| |
patrikp
commented a year ago
Signed-off-by: Patrik Polakovič patrik@alphamail.org