diff --git a/ansible/roles_ocp_workloads/ocp4_workload_jenkins/defaults/main.yml b/ansible/roles_ocp_workloads/ocp4_workload_jenkins/defaults/main.yml index 9264d7052b5..2d4cb1937f4 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_jenkins/defaults/main.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_jenkins/defaults/main.yml @@ -13,6 +13,10 @@ ocp4_workload_jenkins_name: jenkins # Enable OAuth ocp4_workload_jenkins_oauth: true + +# Set to override default password with oauth disabled +ocp4_workload_jenkins_admin_password: password + # Turn off adminstrative monitors (speeds login) ocp4_workload_jenkins_disable_admin_monitors: true diff --git a/ansible/roles_ocp_workloads/ocp4_workload_jenkins/tasks/workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_jenkins/tasks/workload.yml index bf82dbae736..82852dcf3ce 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_jenkins/tasks/workload.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_jenkins/tasks/workload.yml @@ -44,6 +44,35 @@ - r_jenkins.resources[0].status.readyReplicas is defined - r_jenkins.resources[0].status.readyReplicas == r_jenkins.resources[0].spec.replicas +- name: Save jenkins credentials + when: not ocp4_workload_jenkins_oauth + block: + - name: Retrieve Ingress config + kubernetes.core.k8s_info: + api_version: config.openshift.io/v1 + kind: Ingress + name: cluster + register: r_ingress_config + + - name: Save jenkins credentials + agnosticd_user_info: + data: + jenkins_console: "https://jenkins-{{ + ocp4_workload_jenkins_project }}.{{ r_ingress_config.resources[0].spec.domain }}" + jenkins_admin: admin + jenkins_password: "{{ ocp4_workload_jenkins_admin_password }}" + + - name: Print Admin credentials + agnosticd_user_info: + msg: "{{ item }}" + loop: + - "" + - "Your Jenkins login credentials:" + - "Jenkins console: https://jenkins-{{ + ocp4_workload_jenkins_project }}.{{ r_ingress_config.resources[0].spec.domain }}" + - "Jenkins admin user: admin" + - "Jenkins admin password: {{ ocp4_workload_jenkins_admin_password }}" + # Leave this as the last task in the playbook. - name: workload tasks complete debug: diff --git a/ansible/roles_ocp_workloads/ocp4_workload_jenkins/templates/deployment.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_jenkins/templates/deployment.yaml.j2 index 56e514c50ea..27ecf435c7d 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_jenkins/templates/deployment.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_jenkins/templates/deployment.yaml.j2 @@ -35,6 +35,10 @@ spec: value: "false" - name: JENKINS_UC_INSECURE value: "false" +{% if not ocp4_workload_jenkins_oauth %} + - name: JENKINS_PASSWORD + value: "{{ ocp4_workload_jenkins_admin_password }}" +{% endif %} image: "{{ ocp4_workload_jenkins_image }}:{{ ocp4_workload_jenkins_tag }}" imagePullPolicy: IfNotPresent livenessProbe: