ansible/roles/ocp4-workload-rhte-a0009/defaults/main.yml
@@ -9,6 +9,7 @@ _workshop_name: debugging_workshop _workshop_user_password: r3dh4t1! _workshop_che_enabled: true _workshop_etherpad_enabled: true _workshop_gogs_enabled: false _workshop_nexus_enabled: true @@ -23,8 +24,6 @@ _workshop_guide_gitRepositoryGuideReference: master _workshop_guide_gitRepositoryGuideContext: instructions _workshop_guide_gitRepositoryGuideFile: _debugging-workshop.yml _workshop_workspaces_enabled: true _workshop_workspaces_openShiftoAuth: false _workshop_squash_enabled: true _deploy_instance: True ansible/roles/ocp4-workload-rhte-a0009/tasks/workload.yml
@@ -31,38 +31,38 @@ - name: Deploy default Workshop instance when: _deploy_instance|bool block: - name: Create OpenShift Custom Resource for Workshop Instance k8s: state: present merge_type: - strategic-merge - merge definition: "{{ lookup('template', './templates/opentlc-workshop.j2' ) | from_yaml }}" - name: Wait for Workspaces to start k8s: api_version: v1 kind: Deployment name: codeready namespace: workspaces register: codeready_deployment until: - codeready_deployment.result is defined retries: 30 delay: 60 changed_when: false - name: Wait for the Workspaces to be ready k8s: api_version: v1 kind: Deployment name: codeready namespace: workspaces register: codeready_deployment until: - codeready_deployment.result.status.readyReplicas is defined - codeready_deployment.result.status.readyReplicas == 1 retries: 50 delay: 10 changed_when: false - name: Create OpenShift Custom Resource for Workshop Instance k8s: state: present merge_type: - strategic-merge - merge definition: "{{ lookup('template', './templates/opentlc-workshop.j2' ) | from_yaml }}" - name: Wait for Che to start k8s: api_version: v1 kind: Deployment name: che namespace: eclipse-che register: che_deployment until: - che_deployment.result is defined retries: 30 delay: 60 changed_when: false - name: Wait for the Che to be ready k8s: api_version: v1 kind: Deployment name: che namespace: eclipse-che register: che_deployment until: - che_deployment.result.status.readyReplicas is defined - che_deployment.result.status.readyReplicas == 1 retries: 50 delay: 10 changed_when: false # Leave this as the last task in the playbook. - name: workload tasks complete ansible/roles/ocp4-workload-rhte-a0009/templates/crd.j2
@@ -16,4 +16,5 @@ versions: - name: v1alpha1 served: true storage: true storage: true
@@ -6,6 +6,8 @@ spec: users: {{ num_users }} userPassword: {{ _workshop_user_password }} che: enabled: {{ _workshop_che_enabled }} etherpad: enabled: {{ _workshop_etherpad_enabled }} gogs: @@ -25,8 +27,6 @@ gitRepositoryGuideReference: {{ _workshop_guide_gitRepositoryGuideReference }} gitRepositoryGuideContext: {{ _workshop_guide_gitRepositoryGuideContext }} gitRepositoryGuideFile: {{ _workshop_guide_gitRepositoryGuideFile }} workspaces: enabled: {{ _workshop_workspaces_enabled }} openShiftoAuth: {{ _workshop_workspaces_openShiftoAuth }} squash: enabled: {{ _workshop_squash_enabled }}
@@ -17,7 +17,7 @@ containers: - name: openshift-workshop-operator # Replace this with the built image name image: quay.io/mcouliba/debugging-workshop-operator:rhte image: quay.io/mcouliba/openshift-workshop-operator:rhte command: - openshift-workshop-operator imagePullPolicy: Always ansible/roles/ocp4-workload-rhte-a0009/templates/service_account.j2
@@ -3,3 +3,4 @@ metadata: name: openshift-workshop-operator namespace: "{{ _workshop_operator_project }}"
