From f1c7b4201eea73f1437c58febbd03b74307aed63 Mon Sep 17 00:00:00 2001
From: Martin Wehner <mwehner@pro-vision.de>
Date: Tue, 17 Oct 2017 18:43:30 +0200
Subject: [PATCH] Use aem_service_name for consistency and set it to
 aem_instance_name by default

---
 defaults/main.yml   | 1 +
 tasks/start_aem.yml | 2 +-
 tasks/stop_aem.yml  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e2114a5..5c724d9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,4 @@
+aem_service_name: "{{ aem_instance_name }}"
 aem_service_state: started
 aem_service_timeout: 1200
 aem_service_login_url: "http://localhost:{{ aem_port }}/libs/granite/core/content/login.html"
diff --git a/tasks/start_aem.yml b/tasks/start_aem.yml
index 3f7e39a..659df7e 100644
--- a/tasks/start_aem.yml
+++ b/tasks/start_aem.yml
@@ -1,6 +1,6 @@
 - name: Start AEM.
   service:
-    name: "{{ aem_instance_name }}"
+    name: "{{ aem_service_name }}"
     state: started
 
 - name: "Wait for AEM startup. [{{ inventory_hostname }}]"
diff --git a/tasks/stop_aem.yml b/tasks/stop_aem.yml
index 3fa6696..3078f19 100644
--- a/tasks/stop_aem.yml
+++ b/tasks/stop_aem.yml
@@ -1,6 +1,6 @@
 - name: Stop AEM.
   service:
-    name: "{{ aem_instance_name }}"
+    name: "{{ aem_service_name }}"
     state: stopped
 
 - name: Wait for AEM shutdown.