Use the correct syntax to specify stg

Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-03-12 11:35:11 +01:00
parent af01660d27
commit e05fc4c3b5

View file

@ -419,47 +419,56 @@
creates: "/etc/origin/koji-builder-policy-added" creates: "/etc/origin/koji-builder-policy-added"
environment: "{{ osbs_environment }}" environment: "{{ osbs_environment }}"
{% if env == 'staging' %} - name: Create worker namespace
- name: Create worker namespace hosts: osbs-masters-stg[0]
hosts: osbs-masters-stg[0] tags:
tags: - osbs-worker-namespace
- osbs-worker-namespace user: root
user: root roles:
roles: - {
- role: osbs-namespace role: osbs-namespace,
osbs_namespace: "{{ osbs_worker_namespace }}" osbs_namespace: "{{ osbs_worker_namespace }}",
osbs_service_accounts: "{{ osbs_worker_service_accounts }}" osbs_service_accounts: "{{ osbs_worker_service_accounts }}",
osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}" osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}",
osbs_authoritative_registry: "{{ source_registry }}" osbs_authoritative_registry: "{{ source_registry }}",
osbs_sources_command: "{{ osbs_conf_sources_command }}" osbs_sources_command: "{{ osbs_conf_sources_command }}",
osbs_vendor: "{{ osbs_conf_vendor }}" osbs_vendor: "{{ osbs_conf_vendor }}",
when: env == "staging"
}
- name: setup koji secret in worker namespace - name: setup koji secret in worker namespace
hosts: osbs-masters-stg[0] hosts: osbs-masters-stg[0]
tags: tags:
- osbs-worker-namespace - osbs-worker-namespace
roles: roles:
- role: osbs-secret - {
osbs_namespace: "{{ osbs_worker_namespace }}" role: osbs-secret,
osbs_secret_name: kojisecret osbs_namespace: "{{ osbs_worker_namespace }}",
osbs_secret_name: kojisecret,
osbs_secret_files: osbs_secret_files:
- source: "/etc/pki/koji/fedora-builder.pem" - { source: "/etc/pki/koji/fedora-builder.pem",
dest: cert dest: cert
},
when: env == "staging"
}
- name: setup dist registry secret in worker namespace - name: setup dist registry secret in worker namespace
hosts: osbs-masters-stg[0] hosts: osbs-masters-stg[0]
tags: tags:
- osbs-worker-namespace - osbs-worker-namespace
roles: roles:
- role: osbs-secret - {
osbs_namespace: "{{ osbs_worker_namespace }}" role: osbs-secret,
osbs_secret_name: registry-secret osbs_namespace: "{{ osbs_worker_namespace }}",
osbs_secret_name: registry-secret,
osbs_secret_files: osbs_secret_files:
- source: "{{private}}/files/koji/{{docker_cert_name}}.cert.pem" - { source: "{{private}}/files/koji/{{docker_cert_name}}.cert.pem",
dest: registry.crt dest: registry.crt },
- source: "{{private}}/files/koji/{{docker_cert_name}}.key.pem" - { source: "{{private}}/files/koji/{{docker_cert_name}}.key.pem",
dest: registry.key dest: registry.key },
{% endif %} when: env == "staging"
}
- 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]