summaryrefslogtreecommitdiffstats
path: root/roles/openshift_serviceaccounts
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-12-01 09:43:10 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-12-01 09:43:10 -0400
commitb71c3247f1f762b7b99aa081cd9925ecfa4d31e7 (patch)
treec86cce71d3691386451eb03390676a12f3c52f65 /roles/openshift_serviceaccounts
parente796856c804cd7090ed45aba7838436e7fdc9580 (diff)
parentebf659b0c1775f9be3e52a8ef420d568656c10f9 (diff)
downloadopenshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.tar.gz
openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.tar.bz2
openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.tar.xz
openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.zip
Merge branch 'master' into loadbalanced-2
Diffstat (limited to 'roles/openshift_serviceaccounts')
-rw-r--r--roles/openshift_serviceaccounts/tasks/main.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_serviceaccounts/tasks/main.yml b/roles/openshift_serviceaccounts/tasks/main.yml
index d93a25a21..e558a83a2 100644
--- a/roles/openshift_serviceaccounts/tasks/main.yml
+++ b/roles/openshift_serviceaccounts/tasks/main.yml
@@ -13,7 +13,9 @@
changed_when: "'serviceaccounts \"{{ item }}\" already exists' not in _sa_result.stderr and _sa_result.rc == 0"
- name: Get current security context constraints
- shell: "{{ openshift.common.client_binary }} get scc privileged -o yaml > /tmp/scc.yaml"
+ shell: >
+ {{ openshift.common.client_binary }} get scc privileged -o yaml
+ --output-version=v1 > /tmp/scc.yaml
- name: Add security context constraint for {{ item }}
lineinfile:
@@ -23,4 +25,4 @@
with_items: accounts
- name: Apply new scc rules for service accounts
- command: "{{ openshift.common.client_binary }} update -f /tmp/scc.yaml"
+ command: "{{ openshift.common.client_binary }} update -f /tmp/scc.yaml --api-version=v1"