Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Silly me, ClusterRoles are separate objects

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2017-10-08 20:45:29 +00:00
parent 0d614913d1
commit cba7d519d4
3 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/openshift/object/tasks/main.yml
View file

@ -21,12 +21,6 @@
- name: Call `oc apply` on the copied file - name: Call `oc apply` on the copied file
shell: oc -n {{app}} apply -f {{tmpfile.path}} shell: oc -n {{app}} apply -f {{tmpfile.path}}
run_once: true run_once: true
when: global_object is not defined or not global_object
- name: GLOBAL call `oc apply` on the copied file
shell: oc apply -f {{tmpfile.path}}
run_once: true
when: global_object is defined and global_object
- name: Delete temporary file - name: Delete temporary file
file: path={{tmpfile.path}} state=absent file: path={{tmpfile.path}} state=absent

2
roles/openshift/project/tasks/main.yml
View file

@ -35,8 +35,6 @@
name: openshift/object name: openshift/object
vars: vars:
template_fullpath: "{{roles_path}}/openshift/project/templates/role-appowners.yml" template_fullpath: "{{roles_path}}/openshift/project/templates/role-appowners.yml"
# Namespace-local roles are unusable until Openshift 3.6. Remove this global: true when upgraded.
global_object: true
- name: appowners.yml - name: appowners.yml
include_role: include_role:

3
roles/openshift/project/templates/role-appowners.yml
View file

@ -1,5 +1,6 @@
apiVersion: v1 apiVersion: v1
kind: Role # Namespace-local roles did not work until openshift 3.6
kind: ClusterRole
metadata: metadata:
annotations: annotations:
openshift.io/description: An application owner. Can view everything but ConfigMaps. openshift.io/description: An application owner. Can view everything but ConfigMaps.