Merge remote-tracking branch 'origin/master' into ITOPS-1677-add-crowd-support-in-dc-deployment

2025-12-14 00:43:06 -06:00 · 2019-07-11 05:41:57 +00:00
parent 12c31d5c59 26d2e4cbd4
commit 088239cba8
18 changed files with 140 additions and 22 deletions
--- a/roles/product_startup/tasks/main.yml
+++ b/roles/product_startup/tasks/main.yml
@@ -4,6 +4,7 @@
  template:
    src: "product.service.j2"
    dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
+<<<<<<< HEAD
  when: atl_product_edition != "crowd"
  notify:
    - Enable Product
@@ -14,6 +15,11 @@
    src: "crowd.service.j2"
    dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
  when: atl_product_edition == "crowd"
+=======
+    owner: root
+    group: root
+    mode: 0640
+>>>>>>> origin/master
  notify:
    - Enable Product
    - Restart Product