Merge branch 'improvement/enhance_some_ansible_roles' into testing/mc…

…donnnj
cisagov · Oct 16, 2024 · c37072f · c37072f
2 parents 7cb06d9 + 79b554e
commit c37072f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/ansible/roles/cyhy_commander/tasks/main.yml b/ansible/roles/cyhy_commander/tasks/main.yml
@@ -1,4 +1,12 @@
 ---
+#
+# Make sure the cyhy-commander is not running before we make configuration changes
+#
+- name: Ensure cyhy-commander is stopped
+  ansible.builtin.service:
+    name: cyhy-commander
+    state: stopped
+
 #
 # Copy private key to new instance
 #
@@ -34,7 +42,7 @@
   ansible.builtin.service:
     name: cyhy-commander
     enabled: true
-    state: restarted
+    state: started
 
 #
 # Grab the files we need to create the "places" collection from cyhy-core

diff --git a/ansible/roles/cyhy_dashboard/files/ncats-webui.service b/ansible/roles/cyhy_dashboard/files/ncats-webui.service
@@ -2,8 +2,10 @@
 Description=ncats-webui service
 
 [Service]
-Type=simple
+Type=oneshot
+RemainAfterExit=yes
 Restart=on-failure
 RestartSec=10
 User=cyhy
 ExecStart=/usr/bin/make --directory /var/cyhy/ncats-webui/ dev-start
+ExecStart=/usr/bin/make --directory /var/cyhy/ncats-webui/ dev-stop
diff --git a/ansible/roles/mongo/tasks/main.yml b/ansible/roles/mongo/tasks/main.yml
@@ -1,4 +1,19 @@
 ---
+- name: Get service information
+  ansible.builtin.service_facts:
+
+- name: Determine if cyhy-commander needs to be stopped
+  ansible.builtin.set_fact:
+    mongo_stop_commander: "{{ 'cyhy-commander' in ansible_facts.services and ansible_facts.services['cyhy-commander'].state != 'stopped' }}"
+
+# This role will restart MongoDB no matter what which will make the
+# cyhy-commander unhappy if it is running
+- name: Stop the cyhy-commander service
+  ansible.builtin.service:
+    name: cyhy-commander
+    state: stopped
+  when: mongo_stop_commander
+
 - name: Check if any mongo users already exist
   ansible.builtin.command: mongo --eval 'db.getUsers()' admin
   # This is a read-only operation
@@ -68,3 +83,11 @@
   ansible.builtin.service:
     name: mongod
     state: restarted
+
+# Since we would have stopped the cyhy-commander if it was running we need to
+# start it back up.
+- name: Start the cyhy-commander service
+  ansible.builtin.service:
+    name: cyhy-commander
+    state: started
+  when: mongo_stop_commander