replace student_name with ocp_username (#548)

Tiger Kaovilai

2019-08-08 b93eb857b190ca0885562058711c45e77d332ab7

replace student_name with ocp_username (#548)

 ansible/roles/ocp4-workload-open-data-hub-student/readme.adoc

@@ -46,7 +46,6 @@
    -e"ansible_user=${OCP_USERNAME}" \
    -e"ocp_username=${OCP_USERNAME}" \
    -e"ocp_workload=${WORKLOAD}" \
    -e"student_name=test-user" \
    -e"silent=False" \
    -e"guid=${GUID}" \
    -e"ACTION=create"

 ansible/roles/ocp4-workload-open-data-hub-student/tasks/remove_workload.yml

@@ -7,7 +7,7 @@
  k8s:
    state: absent
    name: example-opendatahub
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
    api_version: opendatahub.io/v1alpha1
    kind: OpenDataHub

@@ -15,7 +15,7 @@
  k8s:
    state: absent
    name: opendatahub-operator
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
    api_version: apps/v1
    kind: Deployment

@@ -23,7 +23,7 @@
  k8s:
    state: absent
    name: opendatahub-operator
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
    api_version: rbac.authorization.k8s.io/v1
    kind: Role

@@ -31,7 +31,7 @@
  k8s:
    state: absent
    name: opendatahub-operator
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
    api_version: rbac.authorization.k8s.io/v1
    kind: RoleBinding

@@ -39,14 +39,14 @@
  k8s:
    state: absent
    name: opendatahub-operator
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
    kind: ServiceAccount


- name: remove Project finalizers
  k8s:
    state: present
    name: "open-data-hub-{{ student_name }}"
    name: "open-data-hub-{{ ocp_username }}"
    kind: Namespace
    definition:
      metadata:
@@ -58,15 +58,15 @@
- name: remove the Projects
  k8s:
    state: absent
    name: "open-data-hub-{{ student_name }}"
    name: "open-data-hub-{{ ocp_username }}"
    kind: Project
    api_version: project.openshift.io/v1
    definition:
      metadata:
        labels:
          user: "{{ student_name }}"
          user: "{{ ocp_username }}"

- name: "remove modify and apply rook object-user.yaml for {{ student_name }}"
- name: "remove modify and apply rook object-user.yaml for {{ ocp_username }}"
  k8s:
    state: absent
    definition:
@@ -74,8 +74,8 @@
      kind: CephObjectStoreUser
      metadata:
        labels:
          user: "{{ student_name }}"
        name: "{{ student_name }}"
          user: "{{ ocp_username }}"
        name: "{{ ocp_username }}"
        namespace: rook-ceph
      spec:
        store: my-store
@@ -86,7 +86,7 @@
  k8s_facts:
    api_version: project.openshift.io/v1
    kind: Project
    name: "open-data-hub-{{ student_name }}"
    name: "open-data-hub-{{ ocp_username }}"
  register: result
  failed_when: result.resources | length > 0
  delay: 15

 ansible/roles/ocp4-workload-open-data-hub-student/tasks/workload.yml

@@ -31,17 +31,17 @@
      kind: CephObjectStoreUser
      metadata:
        labels:
          user: "{{ student_name }}"
        name: "{{ student_name }}"
          user: "{{ ocp_username }}"
        name: "{{ ocp_username }}"
        namespace: rook-ceph
      spec:
        store: my-store
        displayName: "my display name"

## obtain secrets for each user
- name: "new-obtain {{ student_name }} secrets"
- name: "new-obtain {{ ocp_username }} secrets"
  k8s_facts:
    name: "rook-ceph-object-user-my-store-{{ student_name }}"
    name: "rook-ceph-object-user-my-store-{{ ocp_username }}"
    namespace: rook-ceph
    kind: Secret
  register: secret
@@ -52,43 +52,43 @@
- name: create the Project
  k8s:
    state: present
    name: "open-data-hub-{{ student_name }}"
    name: "open-data-hub-{{ ocp_username }}"
    kind: ProjectRequest
    api_version: project.openshift.io/v1
    definition:
      metadata:
        labels:
          user: "{{ student_name }}"
          user: "{{ ocp_username }}"

- name: apply service_account.yaml
  k8s:
    state: present
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
    src: "/tmp/open-data-hub/odh/service_account.yaml"

- name: apply role.yaml
  k8s:
    state: present
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
    src: "/tmp/open-data-hub/odh/role.yaml"

- name: apply role_binding.yaml
  k8s:
    state: present
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
    src: "/tmp/open-data-hub/odh/role_binding.yaml"

- name: apply operator.yaml
  k8s:
    state: present
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
    src: "/tmp/open-data-hub/odh/operator.yaml"

# Modifying https://gitlab.com/opendatahub/opendatahub-operator/raw/v0.3.0/deploy/crds/opendatahub_v1alpha1_opendatahub_cr.yaml
- name: create ODH Custom Resource object
  k8s:
    state: present
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
    definition:
      apiVersion: opendatahub.io/v1alpha1
      kind: OpenDataHub
@@ -176,7 +176,7 @@
  k8s_facts:
    kind: Route
    name: jupyterhub
    namespace: "open-data-hub-{{ student_name }}"
    namespace: "open-data-hub-{{ ocp_username }}"
  register: Route
  failed_when: Route.resources | length == 0
  retries: 60
@@ -185,9 +185,9 @@
- debug:
    msg:
    - "user.info: "
    - "user.info: {{ student_name }} Route {{ Route.resources[0].spec.host }}"
    - "user.info: {{ student_name }} AccessKey {{ secret.resources[0].data.AccessKey | b64decode }}"
    - "user.info: {{ student_name }} SecretKey {{ secret.resources[0].data.SecretKey | b64decode }}"
    - "user.info: {{ ocp_username }} Route {{ Route.resources[0].spec.host }}"
    - "user.info: {{ ocp_username }} AccessKey {{ secret.resources[0].data.AccessKey | b64decode }}"
    - "user.info: {{ ocp_username }} SecretKey {{ secret.resources[0].data.SecretKey | b64decode }}"

# Leave this as the last task in the playbook.
- name: workload tasks complete