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

Add the tag to all play and fix template

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-04-26 14:35:36 +02:00
parent 221e04cdfc
commit d92ff97453
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -482,6 +482,8 @@
- source: "/tmp/{{ osbs_namespace }}-reactor-config-secret.yml" - source: "/tmp/{{ osbs_namespace }}-reactor-config-secret.yml"
dest: config.yaml dest: config.yaml
when: env == "staging" when: env == "staging"
tags:
- osbs-orchestrator-namespace
- name: setup client config secret in orchestrator namespace - name: setup client config secret in orchestrator namespace
hosts: osbs-masters-stg[0] hosts: osbs-masters-stg[0]
@ -492,6 +494,8 @@
- source: "/tmp/{{ osbs_namespace }}-client-config-secret.conf" - source: "/tmp/{{ osbs_namespace }}-client-config-secret.conf"
dest: osbs.conf dest: osbs.conf
when: env == "staging" when: env == "staging"
tags:
- osbs-orchestrator-namespace
- name: setup koji secret in orchestrator namespace - name: setup koji secret in orchestrator namespace
hosts: osbs-masters-stg[0] hosts: osbs-masters-stg[0]
@ -506,6 +510,8 @@
- source: "{{ private }}/files/koji/containerbuild.pem" - source: "{{ private }}/files/koji/containerbuild.pem"
dest: cert dest: cert
when: env == "staging" when: env == "staging"
tags:
- osbs-orchestrator-namespace
- name: setup dist registry secret in orchestrator namespace - name: setup dist registry secret in orchestrator namespace
hosts: osbs-masters-stg[0] hosts: osbs-masters-stg[0]
@ -522,6 +528,8 @@
- source: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key" - source: "{{private}}/files/docker-registry/{{env}}/docker-registry-internal.key"
dest: registry.key dest: registry.key
when: env == "staging" when: env == "staging"
tags:
- osbs-orchestrator-namespace
- name: setup orchestrator token for x86_64-osbs - name: setup orchestrator token for x86_64-osbs
hosts: osbs-masters-stg[0] hosts: osbs-masters-stg[0]
@ -536,6 +544,8 @@
- source: "{{ private }}/files/osbs/staging/x86-64-osbs-stg-orchestrator" - source: "{{ private }}/files/osbs/staging/x86-64-osbs-stg-orchestrator"
dest: token dest: token
when: env == "staging" when: env == "staging"
tags:
- osbs-orchestrator-namespace
- name: Manage docker images and image stream - name: Manage docker images and image stream
hosts: osbs-masters-stg[0]:osbs-masters[0] hosts: osbs-masters-stg[0]:osbs-masters[0]

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

@ -26,7 +26,7 @@ koji_hub = {{ osbs_koji_hub }}
{% if osbs_koji_root %} {% if osbs_koji_root %}
koji_root = {{ osbs_koji_root }} koji_root = {{ osbs_koji_root }}
{% endif %} {% endif %}
{% koji_use_kerberos %} {% if koji_use_kerberos %}
koji_use_kerberos = {{ koji_use_kerberos }} koji_use_kerberos = {{ koji_use_kerberos }}
{% endif %} {% endif %}
{% if koji_kerberos_keytab %} {% if koji_kerberos_keytab %}