[FMN] Update fasjson configuration
The new version of FMN is completely ported to python3, so we can remove some python2 related things, also enable fasjson for staging. Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
parent
c5e21e120f
commit
be40e404a0
2 changed files with 5 additions and 6 deletions
|
@ -55,7 +55,7 @@
|
||||||
- tasks.py
|
- tasks.py
|
||||||
- util.py
|
- util.py
|
||||||
when:
|
when:
|
||||||
inventory_hostname.startswith('notifs-backend01.iad')
|
inventory_hostname.startswith('notifs-backend01.iad') or env != 'staging'
|
||||||
tags:
|
tags:
|
||||||
- notifs
|
- notifs
|
||||||
- notifs/backend
|
- notifs/backend
|
||||||
|
|
|
@ -91,21 +91,20 @@ config = {
|
||||||
# The notification backend uses this to build a fas cache of ircnicks
|
# The notification backend uses this to build a fas cache of ircnicks
|
||||||
# to fas usernames so it can act appropriately on certain message types.
|
# to fas usernames so it can act appropriately on certain message types.
|
||||||
{% if env == 'staging' -%}
|
{% if env == 'staging' -%}
|
||||||
"fas_credentials": {
|
"fasjson": {
|
||||||
"username": "{{fedoraDummyUser}}",
|
"active": True,
|
||||||
"password": "{{fedoraDummyUserPassword}}",
|
"url": "https://fasjson.stg.fedoraproject.org/"
|
||||||
"base_url": "https://accounts.stg.fedoraproject.org",
|
|
||||||
},
|
},
|
||||||
{% else -%}
|
{% else -%}
|
||||||
"fasjson": {
|
"fasjson": {
|
||||||
"active": True,
|
"active": True,
|
||||||
"url": "https://fasjson.fedoraproject.org/"
|
"url": "https://fasjson.fedoraproject.org/"
|
||||||
},
|
},
|
||||||
|
{% endif %}
|
||||||
"fas_credentials": {
|
"fas_credentials": {
|
||||||
"username": "{{fedoraDummyUser}}",
|
"username": "{{fedoraDummyUser}}",
|
||||||
"password": "{{fedoraDummyUserPassword}}",
|
"password": "{{fedoraDummyUserPassword}}",
|
||||||
},
|
},
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
|
|
||||||
## Backend stuff ##
|
## Backend stuff ##
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue