summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kadlčík <frostyx@email.cz>2017-04-11 13:24:25 +0200
committerMiroslav Suchý <msuchy@redhat.com>2017-04-12 08:53:09 +0200
commitb7c49486121ee91adb30b7bd6bed4dce6cc975a9 (patch)
tree0ecb9e1b104e02bcc0fe2c95d2e0dc3c09f4dffb
parent4f65d09f17a8b8acc31b061fa60a95f91edd070a (diff)
downloadansible-b7c49486121ee91adb30b7bd6bed4dce6cc975a9.tar.gz
ansible-b7c49486121ee91adb30b7bd6bed4dce6cc975a9.tar.xz
ansible-b7c49486121ee91adb30b7bd6bed4dce6cc975a9.zip
Drop OIDC settings, we will use NO_AUTH
-rw-r--r--roles/copr/mbs/tasks/main.yml3
-rw-r--r--roles/copr/mbs/templates/client_secrets.json12
-rw-r--r--roles/copr/mbs/templates/config.py2
3 files changed, 1 insertions, 16 deletions
diff --git a/roles/copr/mbs/tasks/main.yml b/roles/copr/mbs/tasks/main.yml
index e18c8e591..058578550 100644
--- a/roles/copr/mbs/tasks/main.yml
+++ b/roles/copr/mbs/tasks/main.yml
@@ -118,9 +118,6 @@
- name: Copy config for copr-cli
template: src=copr.conf dest=/etc/module-build-service/copr.conf
-- name: Install client_secrets.json
- template: src=client_secrets.json dest=/etc/module-build-service/
-
- name: Upgrade database
command: mbs-upgradedb
diff --git a/roles/copr/mbs/templates/client_secrets.json b/roles/copr/mbs/templates/client_secrets.json
deleted file mode 100644
index ff490935c..000000000
--- a/roles/copr/mbs/templates/client_secrets.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "web": {
- "auth_uri": "https://id.stg.fedoraproject.org/openidc/Authorization",
- "client_id": "mbs-authorizer",
- "client_secret": "{{ copr_mbs_client_secret }}",
- "redirect_uris": [
- "http://localhost:13747/"
- ],
- "token_uri": "https://id.stg.fedoraproject.org/openidc/Token",
- "token_introspection_uri": "https://id.stg.fedoraproject.org/openidc/TokenInfo"
- }
-}
diff --git a/roles/copr/mbs/templates/config.py b/roles/copr/mbs/templates/config.py
index e5c06e998..409fef36e 100644
--- a/roles/copr/mbs/templates/config.py
+++ b/roles/copr/mbs/templates/config.py
@@ -8,8 +8,8 @@ from base_config import confdir, dbdir
class ProdConfiguration(base.ProdConfiguration):
SYSTEM = 'copr'
REQUIRE_PACKAGER = False
- OIDC_CLIENT_SECRETS = '/etc/module-build-service/client_secrets.json'
SECRET_KEY = '{{ copr_mbs_secret_key }}'
+ NO_AUTH = True
class DevConfiguration(base.DevConfiguration):