From e879931d0d093fac33c5c3bd8d32fab176e68c93 Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Mon, 13 Mar 2017 13:11:28 -0400
Subject: Refactor and remove openshift_serviceaccount

---
 roles/openshift_serviceaccounts/meta/main.yml      | 16 ---------
 .../tasks/legacy_add_scc_to_user.yml               | 38 ----------------------
 roles/openshift_serviceaccounts/tasks/main.yml     | 28 ----------------
 .../templates/serviceaccount.j2                    |  4 ---
 4 files changed, 86 deletions(-)
 delete mode 100644 roles/openshift_serviceaccounts/meta/main.yml
 delete mode 100644 roles/openshift_serviceaccounts/tasks/legacy_add_scc_to_user.yml
 delete mode 100644 roles/openshift_serviceaccounts/tasks/main.yml
 delete mode 100644 roles/openshift_serviceaccounts/templates/serviceaccount.j2

(limited to 'roles/openshift_serviceaccounts')

diff --git a/roles/openshift_serviceaccounts/meta/main.yml b/roles/openshift_serviceaccounts/meta/main.yml
deleted file mode 100644
index 7a30c220f..000000000
--- a/roles/openshift_serviceaccounts/meta/main.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-galaxy_info:
-  author: OpenShift Operations
-  description: OpenShift Service Accounts
-  company: Red Hat, Inc.
-  license: Apache License, Version 2.0
-  min_ansible_version: 1.9
-  platforms:
-  - name: EL
-    versions:
-    - 7
-  categories:
-  - cloud
-dependencies:
-- { role: openshift_facts }
-- { role: lib_openshift }
diff --git a/roles/openshift_serviceaccounts/tasks/legacy_add_scc_to_user.yml b/roles/openshift_serviceaccounts/tasks/legacy_add_scc_to_user.yml
deleted file mode 100644
index b8cbe9a84..000000000
--- a/roles/openshift_serviceaccounts/tasks/legacy_add_scc_to_user.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-####
-#
-# OSE 3.0.z did not have 'oadm policy add-scc-to-user'.
-#
-####
-
-- name: tmp dir for openshift
-  file:
-    path: /tmp/openshift
-    state: directory
-    owner: root
-    mode: 0700
-
-- name: Create service account configs
-  template:
-    src: serviceaccount.j2
-    dest: "/tmp/openshift/{{ item }}-serviceaccount.yaml"
-  with_items: '{{ openshift_serviceaccounts_names }}'
-
-- name: Get current security context constraints
-  shell: >
-    {{ openshift.common.client_binary }} get scc privileged -o yaml
-    --output-version=v1 > /tmp/openshift/scc.yaml
-  changed_when: false
-
-- name: Add security context constraint for {{ item }}
-  lineinfile:
-    dest: /tmp/openshift/scc.yaml
-    line: "- system:serviceaccount:{{ openshift_serviceaccounts_namespace }}:{{ item.0 }}"
-    insertafter: "^users:$"
-  when: "item.1.rc == 0 and 'system:serviceaccount:{{ openshift_serviceaccounts_namespace }}:{{ item.0 }}' not in {{ (item.1.stdout | from_yaml).users }}"
-  with_nested:
-  - '{{ openshift_serviceaccounts_names }}'
-  - '{{ scc_test.results }}'
-
-- name: Apply new scc rules for service accounts
-  command: "{{ openshift.common.client_binary }} update -f /tmp/openshift/scc.yaml --api-version=v1"
diff --git a/roles/openshift_serviceaccounts/tasks/main.yml b/roles/openshift_serviceaccounts/tasks/main.yml
deleted file mode 100644
index 1d570fa5b..000000000
--- a/roles/openshift_serviceaccounts/tasks/main.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: create the service account
-  oc_serviceaccount:
-    name: "{{ item }}"
-    namespace: "{{ openshift_serviceaccounts_namespace }}"
-    state: present
-  with_items:
-  - "{{ openshift_serviceaccounts_names }}"
-
-- name: test if scc needs to be updated
-  command: >
-      {{ openshift.common.client_binary }} get scc {{ item }} -o yaml
-  changed_when: false
-  failed_when: false
-  register: scc_test
-  with_items: "{{ openshift_serviceaccounts_sccs }}"
-
-- name: Grant the user access to the appropriate scc
-  command: >
-      {{ openshift.common.client_binary }} adm policy add-scc-to-user
-      {{ item.1.item }} system:serviceaccount:{{ openshift_serviceaccounts_namespace }}:{{ item.0 }}
-  when: "openshift.common.version_gte_3_1_or_1_1 and item.1.rc == 0 and 'system:serviceaccount:{{ openshift_serviceaccounts_namespace }}:{{ item.0 }}' not in {{ (item.1.stdout | from_yaml).users | default([]) }}"
-  with_nested:
-  - "{{ openshift_serviceaccounts_names }}"
-  - "{{ scc_test.results }}"
-
-- include: legacy_add_scc_to_user.yml
-  when: not openshift.common.version_gte_3_1_or_1_1
diff --git a/roles/openshift_serviceaccounts/templates/serviceaccount.j2 b/roles/openshift_serviceaccounts/templates/serviceaccount.j2
deleted file mode 100644
index c5f12421f..000000000
--- a/roles/openshift_serviceaccounts/templates/serviceaccount.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ item.0 }}
-- 
cgit v1.2.3