waiverdb: Create the rabbitmq user for waiverdb and add some spacing
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
parent
1f9a864e92
commit
15bc225dd3
1 changed files with 17 additions and 0 deletions
|
@ -9,6 +9,9 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
|
- role: rabbit/user
|
||||||
|
username: "waiverdb{{ env_suffix }}"
|
||||||
|
|
||||||
# The openshift/project role breaks if the project already exists:
|
# The openshift/project role breaks if the project already exists:
|
||||||
# https://pagure.io/fedora-infrastructure/issue/6404
|
# https://pagure.io/fedora-infrastructure/issue/6404
|
||||||
- role: openshift/project
|
- role: openshift/project
|
||||||
|
@ -26,72 +29,86 @@
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
template: secret.yml
|
template: secret.yml
|
||||||
objectname: secret.yml
|
objectname: secret.yml
|
||||||
|
|
||||||
- role: openshift/secret-file
|
- role: openshift/secret-file
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
secret_name: waiverdb-stg-secret
|
secret_name: waiverdb-stg-secret
|
||||||
key: client_secrets.json
|
key: client_secrets.json
|
||||||
template: client_secrets.json
|
template: client_secrets.json
|
||||||
|
|
||||||
- role: openshift/secret-file
|
- role: openshift/secret-file
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
secret_name: waiverdb-fedora-messaging-key
|
secret_name: waiverdb-fedora-messaging-key
|
||||||
key: waiverdb.key
|
key: waiverdb.key
|
||||||
privatefile: "rabbitmq/{{env}}/pki/private/waiverdb{{env_suffix}}.key"
|
privatefile: "rabbitmq/{{env}}/pki/private/waiverdb{{env_suffix}}.key"
|
||||||
when: env == "staging"
|
when: env == "staging"
|
||||||
|
|
||||||
- role: openshift/secret-file
|
- role: openshift/secret-file
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
secret_name: waiverdb-fedora-messaging-crt
|
secret_name: waiverdb-fedora-messaging-crt
|
||||||
key: waiverdb.crt
|
key: waiverdb.crt
|
||||||
privatefile: "rabbitmq/{{env}}/pki/issued/waiverdb{{env_suffix}}.crt"
|
privatefile: "rabbitmq/{{env}}/pki/issued/waiverdb{{env_suffix}}.crt"
|
||||||
when: env == "staging"
|
when: env == "staging"
|
||||||
|
|
||||||
- role: openshift/secret-file
|
- role: openshift/secret-file
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
secret_name: waiverdb-fedora-messaging-ca
|
secret_name: waiverdb-fedora-messaging-ca
|
||||||
key: waiverdb.ca
|
key: waiverdb.ca
|
||||||
privatefile: "rabbitmq/{{env}}/pki/ca.crt"
|
privatefile: "rabbitmq/{{env}}/pki/ca.crt"
|
||||||
when: env == "staging"
|
when: env == "staging"
|
||||||
|
|
||||||
- role: openshift/secret-file
|
- role: openshift/secret-file
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
secret_name: waiverdb-fedmsg-key
|
secret_name: waiverdb-fedmsg-key
|
||||||
key: fedmsg-waiverdb.key
|
key: fedmsg-waiverdb.key
|
||||||
privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.key
|
privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.key
|
||||||
when: env != "staging"
|
when: env != "staging"
|
||||||
|
|
||||||
- role: openshift/secret-file
|
- role: openshift/secret-file
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
secret_name: waiverdb-fedmsg-crt
|
secret_name: waiverdb-fedmsg-crt
|
||||||
key: fedmsg-waiverdb.crt
|
key: fedmsg-waiverdb.crt
|
||||||
privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.crt
|
privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.crt
|
||||||
when: env != "staging"
|
when: env != "staging"
|
||||||
|
|
||||||
- role: openshift/object
|
- role: openshift/object
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
template: imagestream.yml
|
template: imagestream.yml
|
||||||
objectname: imagestream.yml
|
objectname: imagestream.yml
|
||||||
|
|
||||||
- role: openshift/object
|
- role: openshift/object
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
template: buildconfig.yml
|
template: buildconfig.yml
|
||||||
objectname: buildconfig.yml
|
objectname: buildconfig.yml
|
||||||
|
|
||||||
- role: openshift/object
|
- role: openshift/object
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
template: configmap.yml
|
template: configmap.yml
|
||||||
objectname: configmap.yml
|
objectname: configmap.yml
|
||||||
|
|
||||||
- role: openshift/object
|
- role: openshift/object
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
file: service.yml
|
file: service.yml
|
||||||
objectname: service.yml
|
objectname: service.yml
|
||||||
|
|
||||||
- role: openshift/route
|
- role: openshift/route
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
routename: web-pretty
|
routename: web-pretty
|
||||||
host: "waiverdb{{ env_suffix }}.fedoraproject.org"
|
host: "waiverdb{{ env_suffix }}.fedoraproject.org"
|
||||||
serviceport: web
|
serviceport: web
|
||||||
servicename: waiverdb-web
|
servicename: waiverdb-web
|
||||||
|
|
||||||
# TODO -- someday retire this old route in favor of the pretty one above.
|
# TODO -- someday retire this old route in favor of the pretty one above.
|
||||||
- role: openshift/object
|
- role: openshift/object
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
file: route.yml
|
file: route.yml
|
||||||
objectname: route.yml
|
objectname: route.yml
|
||||||
|
|
||||||
- role: openshift/object
|
- role: openshift/object
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
template: deploymentconfig.yml
|
template: deploymentconfig.yml
|
||||||
objectname: deploymentconfig.yml
|
objectname: deploymentconfig.yml
|
||||||
|
|
||||||
- role: openshift/rollout
|
- role: openshift/rollout
|
||||||
app: waiverdb
|
app: waiverdb
|
||||||
dcname: waiverdb-web
|
dcname: waiverdb-web
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue