From 1c46b3cca4a5c1fcc8c59b00f476cf3b77b7d2fa Mon Sep 17 00:00:00 2001
From: Azra Sulthana <asulthana@atlassian.com>
Date: Fri, 12 Jul 2019 04:29:47 +0000
Subject: [PATCH] Removed crowd_startup_exec_path

---
 roles/product_startup/defaults/main.yml       |  3 +--
 roles/product_startup/tasks/main.yml          | 13 -------------
 .../templates/crowd.service.j2                | 19 -------------------
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 roles/product_startup/templates/crowd.service.j2

diff --git a/roles/product_startup/defaults/main.yml b/roles/product_startup/defaults/main.yml
index 48b9dc0..391d11c 100644
--- a/roles/product_startup/defaults/main.yml
+++ b/roles/product_startup/defaults/main.yml
@@ -8,9 +8,8 @@ atl_startup_script_map:
   jira: "start-jira.sh"
   confluence: "start-confluence.sh"
   stash: "start-bitbucket.sh"
-  crowd: "start_crowd.sh"
+  crowd: "../start_crowd.sh"
 
-crowd_startup_exec_path: "{{ atl_product_installation_current }}/{{ atl_startup_script_map[atl_product_family] }}"
 atl_startup_exec_path: "{{ atl_product_installation_current }}/bin/{{ atl_startup_script_map[atl_product_family] }}"
 atl_startup_exec_options: ["-fg"]
 atl_startup_systemd_params: []
diff --git a/roles/product_startup/tasks/main.yml b/roles/product_startup/tasks/main.yml
index b2ef75a..706bee3 100644
--- a/roles/product_startup/tasks/main.yml
+++ b/roles/product_startup/tasks/main.yml
@@ -7,19 +7,6 @@
     owner: root
     group: root
     mode: 0640
-  when: atl_product_edition != "crowd"
-  notify:
-    - Enable Product
-    - Restart Product
-
-- name: "Install systemd service file for crowd"
-  template:
-    src: "crowd.service.j2"
-    dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
-    owner: root
-    group: root
-    mode: 0640
-  when: atl_product_edition == "crowd"
   notify:
     - Enable Product
     - Restart Product
diff --git a/roles/product_startup/templates/crowd.service.j2 b/roles/product_startup/templates/crowd.service.j2
deleted file mode 100644
index 5c71d27..0000000
--- a/roles/product_startup/templates/crowd.service.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Atlassian {{ atl_product_edition }}
-After=network-online.target
-
-[Service]
-User={{ atl_product_user }}
-Group={{ atl_product_user }}
-
-{% for p in atl_startup_systemd_params -%}
-  {{ p }}
-{% endfor %}
-
-ExecStart={{ crowd_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %}
-
-Restart=on-failure
-
-[Install]
-WantedBy=multi-target.target
-