Use the correct syntax to specify stg
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
parent
af01660d27
commit
e05fc4c3b5
1 changed files with 46 additions and 37 deletions
|
@ -419,47 +419,56 @@
|
|||
creates: "/etc/origin/koji-builder-policy-added"
|
||||
environment: "{{ osbs_environment }}"
|
||||
|
||||
{% if env == 'staging' %}
|
||||
- name: Create worker namespace
|
||||
hosts: osbs-masters-stg[0]
|
||||
tags:
|
||||
- osbs-worker-namespace
|
||||
user: root
|
||||
roles:
|
||||
- role: osbs-namespace
|
||||
osbs_namespace: "{{ osbs_worker_namespace }}"
|
||||
osbs_service_accounts: "{{ osbs_worker_service_accounts }}"
|
||||
osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}"
|
||||
osbs_authoritative_registry: "{{ source_registry }}"
|
||||
osbs_sources_command: "{{ osbs_conf_sources_command }}"
|
||||
osbs_vendor: "{{ osbs_conf_vendor }}"
|
||||
- name: Create worker namespace
|
||||
hosts: osbs-masters-stg[0]
|
||||
tags:
|
||||
- osbs-worker-namespace
|
||||
user: root
|
||||
roles:
|
||||
- {
|
||||
role: osbs-namespace,
|
||||
osbs_namespace: "{{ osbs_worker_namespace }}",
|
||||
osbs_service_accounts: "{{ osbs_worker_service_accounts }}",
|
||||
osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}",
|
||||
osbs_authoritative_registry: "{{ source_registry }}",
|
||||
osbs_sources_command: "{{ osbs_conf_sources_command }}",
|
||||
osbs_vendor: "{{ osbs_conf_vendor }}",
|
||||
when: env == "staging"
|
||||
}
|
||||
|
||||
- name: setup koji secret in worker namespace
|
||||
hosts: osbs-masters-stg[0]
|
||||
tags:
|
||||
- osbs-worker-namespace
|
||||
roles:
|
||||
- role: osbs-secret
|
||||
osbs_namespace: "{{ osbs_worker_namespace }}"
|
||||
osbs_secret_name: kojisecret
|
||||
- name: setup koji secret in worker namespace
|
||||
hosts: osbs-masters-stg[0]
|
||||
tags:
|
||||
- osbs-worker-namespace
|
||||
roles:
|
||||
- {
|
||||
role: osbs-secret,
|
||||
osbs_namespace: "{{ osbs_worker_namespace }}",
|
||||
osbs_secret_name: kojisecret,
|
||||
osbs_secret_files:
|
||||
- source: "/etc/pki/koji/fedora-builder.pem"
|
||||
dest: cert
|
||||
- { source: "/etc/pki/koji/fedora-builder.pem",
|
||||
dest: cert
|
||||
},
|
||||
when: env == "staging"
|
||||
}
|
||||
|
||||
- name: setup dist registry secret in worker namespace
|
||||
hosts: osbs-masters-stg[0]
|
||||
tags:
|
||||
- osbs-worker-namespace
|
||||
roles:
|
||||
- role: osbs-secret
|
||||
osbs_namespace: "{{ osbs_worker_namespace }}"
|
||||
osbs_secret_name: registry-secret
|
||||
- name: setup dist registry secret in worker namespace
|
||||
hosts: osbs-masters-stg[0]
|
||||
tags:
|
||||
- osbs-worker-namespace
|
||||
roles:
|
||||
- {
|
||||
role: osbs-secret,
|
||||
osbs_namespace: "{{ osbs_worker_namespace }}",
|
||||
osbs_secret_name: registry-secret,
|
||||
osbs_secret_files:
|
||||
- source: "{{private}}/files/koji/{{docker_cert_name}}.cert.pem"
|
||||
dest: registry.crt
|
||||
- source: "{{private}}/files/koji/{{docker_cert_name}}.key.pem"
|
||||
dest: registry.key
|
||||
{% endif %}
|
||||
- { source: "{{private}}/files/koji/{{docker_cert_name}}.cert.pem",
|
||||
dest: registry.crt },
|
||||
- { source: "{{private}}/files/koji/{{docker_cert_name}}.key.pem",
|
||||
dest: registry.key },
|
||||
when: env == "staging"
|
||||
}
|
||||
|
||||
|
||||
- name: Manage docker images and image stream
|
||||
hosts: osbs-masters-stg[0]:osbs-masters[0]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue