From ecdfa641c34f8ada2248219a5cb266bcc8959ea7 Mon Sep 17 00:00:00 2001
From: Guillaume Coré <gucore@redhat.com>
Date: Tue, 06 Feb 2018 09:46:45 +0100
Subject: [PATCH] ocp-workloads: allow user to provide empty ocp_user_groups
---
ansible/roles/ocp-workload-developer-environment/tasks/pre_workload.yml | 8 +++++---
ansible/roles/ocp-workload-developer-environment/tasks/remove_workload.yml | 24 +++++++++++++++---------
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/ansible/roles/ocp-workload-developer-environment/tasks/pre_workload.yml b/ansible/roles/ocp-workload-developer-environment/tasks/pre_workload.yml
index 5a3dee8..346871c 100644
--- a/ansible/roles/ocp-workload-developer-environment/tasks/pre_workload.yml
+++ b/ansible/roles/ocp-workload-developer-environment/tasks/pre_workload.yml
@@ -1,9 +1,11 @@
---
- name: Add user to developer group (allowed to create projects)
- shell: "oadm groups add-users {{item}} {{ocp_username}}"
+ command: "oadm groups add-users {{item}} {{ocp_username}}"
register: groupadd_register
with_items: "{{ocp_user_groups}}"
- when: ocp_username is defined and ocp_user_groups is defined
+ when:
+ - ocp_username is defined
+ - ocp_user_groups | default([]) | length > 0
- name: test that command worked
debug:
@@ -11,7 +13,7 @@
verbosity: 2
- name: Create user Quota - clusterresourcequota
- shell: |
+ command: |
oc create clusterquota clusterquota-"{{ocp_username}}-{{guid}}" \
--project-annotation-selector=openshift.io/requester="{{ocp_username}}" \
--hard requests.cpu="{{quota_requests_cpu}}" \
diff --git a/ansible/roles/ocp-workload-developer-environment/tasks/remove_workload.yml b/ansible/roles/ocp-workload-developer-environment/tasks/remove_workload.yml
index 4c3b2f9..bf2ef77 100644
--- a/ansible/roles/ocp-workload-developer-environment/tasks/remove_workload.yml
+++ b/ansible/roles/ocp-workload-developer-environment/tasks/remove_workload.yml
@@ -4,21 +4,23 @@
msg: "Pre-Software checks completed successfully - Removed"
- name: Remove user from developer group - (remove ability to create projects)
- shell: "oadm groups remove-users {{item}} {{ocp_username}}"
+ command: "oadm groups remove-users {{item}} {{ocp_username}}"
register: groupadd_register
with_items: "{{ocp_user_groups}}"
- when: ocp_username is defined and ocp_user_groups is defined
+ when:
+ - ocp_username is defined
+ - ocp_user_groups | default([]) | length > 0
- name: Remove user Quota - oc delete clusterresourcequota "clusterquota-{{ocp_username}}-{{guid}}"
- shell: oc delete clusterresourcequota clusterquota-{{ocp_username}}-{{guid}}
+ command: oc delete clusterresourcequota clusterquota-{{ocp_username}}-{{guid}}
ignore_errors: true
- name: Remove user Quota - oc delete clusterresourcequota "clusterquota-{{ocp_username}}"
- shell: oc delete clusterresourcequota clusterquota-{{ocp_username}}
+ command: oc delete clusterresourcequota clusterquota-{{ocp_username}}
ignore_errors: true
- name: Remove user Projects - oc get projects
- shell: "oc get projects -o json"
+ command: "oc get projects -o json"
register: all_projects
- name: Remove user Projects - Convert output to json
@@ -29,14 +31,18 @@
debug:
msg: "found user project: {{item.metadata.name}}"
verbosity: 1
- when: item.metadata.annotations['openshift.io/requester'] is defined and item.metadata.annotations['openshift.io/requester'] == "{{ocp_username}}"
+ when:
+ - item.metadata.annotations['openshift.io/requester'] is defined
+ - item.metadata.annotations['openshift.io/requester'] == "{{ocp_username}}"
with_items: "{{projects['items']}}"
- name: Remove user Projects - "oc delete project {{item.metadata.name}}"
- shell: "oc delete project {{item.metadata.name}}"
+ command: "oc delete project {{item.metadata.name}}"
when:
- - (item.metadata.annotations['openshift.io/requester'] is defined and item.metadata.annotations['openshift.io/requester'] == "{{ocp_username}}")
- - (item.status.phase is defined and item.status.phase != "Terminating")
+ - item.metadata.annotations['openshift.io/requester'] is defined
+ - item.metadata.annotations['openshift.io/requester'] == "{{ocp_username}}"
+ - item.status.phase is defined
+ - item.status.phase != "Terminating"
with_items: "{{projects['items']}}"
- name: post_workload Tasks Complete
--
Gitblit v1.9.3