Coryleeio/fix analytics jenkins role (#4374)

* Updating analytics jenkins role to work again, and to be more consistent with current codebase patterns

* Updating analytics jenkins role to work again, and to be more consistent with current codebase patterns. Moved jenkins.j2 to the directory with other j2 templates

playbooks/analytics-jenkins.yml

@@ -4,5 +4,10 @@
   hosts: all
   become: True
   roles:
-  - jenkins_analytics
-  - nginx
+  - role: jenkins_analytics
+    ansible_ssh_user: ubuntu
+  - role: nginx
+    nginx_sites:
+    - jenkins
+    nginx_default_sites:
+    - jenkins

playbooks/roles/jenkins_analytics/defaults/main.yml

@@ -293,4 +293,5 @@ jenkins_analytics_plugins:
     - { name: "translation", version: "1.12" }
     - { name: "violations", version: "0.7.11" }
     - { name: "windows-slaves", version: "1.0" }
+    - { name: "workflow-step-api", version: "1.14.2" }
     - { name: "xunit", version: "1.93"}

playbooks/roles/jenkins_master/tasks/main.yml

@@ -249,23 +249,6 @@
     - install:base
     - install:plugins
 
-- name: Setup nginx vhost
-  template:
-    src: "etc/nginx/sites-available/jenkins.j2"
-    dest: "{{ nginx_sites_available_dir }}/jenkins"
-  tags:
-    - install
-    - install:vhosts
-
-- name: Enable jenkins vhost
-  file:
-    src: "{{ nginx_sites_available_dir }}/jenkins"
-    dest: "{{ nginx_sites_enabled_dir }}/jenkins"
-    state: link
-  tags:
-    - install
-    - install:vhosts
-
 - include: datadog.yml
   when: COMMON_ENABLE_DATADOG
   tags: