summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-04 16:52:30 -0400
committerGitHub <noreply@github.com>2017-08-04 16:52:30 -0400
commit145c90c9eb58ae9ce25e7795fcf403a2595d3580 (patch)
treebf734f94be1203443c86572f735425c05d051457
parentf338eb1e5728af88ee6de26e7a703b521b386f7a (diff)
parent497c01b5aa249eced1df4ba5a05c88a68df7591d (diff)
downloadopenshift-145c90c9eb58ae9ce25e7795fcf403a2595d3580.tar.gz
openshift-145c90c9eb58ae9ce25e7795fcf403a2595d3580.tar.bz2
openshift-145c90c9eb58ae9ce25e7795fcf403a2595d3580.tar.xz
openshift-145c90c9eb58ae9ce25e7795fcf403a2595d3580.zip
Merge pull request #4673 from enoodle/allow_manageiq_to_read_logs
Adding pods/logs to manageiq role
-rw-r--r--roles/openshift_manageiq/tasks/main.yaml6
-rw-r--r--roles/openshift_manageiq/vars/main.yml4
2 files changed, 8 insertions, 2 deletions
diff --git a/roles/openshift_manageiq/tasks/main.yaml b/roles/openshift_manageiq/tasks/main.yaml
index cfc4e2722..7789d2232 100644
--- a/roles/openshift_manageiq/tasks/main.yaml
+++ b/roles/openshift_manageiq/tasks/main.yaml
@@ -24,6 +24,12 @@
- apiGroups:
- ""
resources:
+ - pods/log
+ verbs:
+ - "get"
+ - apiGroups:
+ - ""
+ resources:
- pods/proxy
verbs:
- "*"
diff --git a/roles/openshift_manageiq/vars/main.yml b/roles/openshift_manageiq/vars/main.yml
index 15d667628..7ccc2fc3b 100644
--- a/roles/openshift_manageiq/vars/main.yml
+++ b/roles/openshift_manageiq/vars/main.yml
@@ -3,9 +3,9 @@ manage_iq_tasks:
- resource_kind: role
resource_name: admin
user: management-admin
-- resource_kind: role
+- resource_kind: cluster-role
resource_name: management-infra-admin
- user: management-admin
+ user: system:serviceaccount:management-infra:management-admin
- resource_kind: cluster-role
resource_name: cluster-reader
user: system:serviceaccount:management-infra:management-admin