shared roles

.github/workflows/deploy_msm.yaml

@@ -35,7 +35,7 @@ jobs:
           python-version: '3.11'
 
       - name: Setup ansible
-        run: pip install ansible && export PATH="$HOME/.local/bin:$PATH" && ansible-galaxy collection install cloud.terraform && ansible-galaxy collection install datadog.dd
+        run: pip install ansible passlib==1.7.4 && export PATH="$HOME/.local/bin:$PATH" && ansible-galaxy collection install -r ansible/roles/requirements.yml
 
       - name: Setup Terraform with specified version on the runner
         uses: hashicorp/setup-terraform@651471c36a6092792c552e8b1bef71e592b462d8 # @v3

ansible/roles/dd_monitor/tasks/main.yaml

@@ -6,6 +6,20 @@
       - ca-certificates
       - iputils-ping
 
+- name: Import the ssh_config role from the nycmesh.common collection
+  ansible.builtin.import_role:
+    name: nycmesh.common.ssh_config
+
+- name: Import the mesh_dns role from the nycmesh.common collection
+  ansible.builtin.import_role:
+    name: nycmesh.common.mesh_dns
+  vars:
+    extra_resolvers: "9.9.9.9"
+
+- name: Import the support_account role from the nycmesh.common collection
+  ansible.builtin.import_role:
+    name: nycmesh.common.support_account
+
 - name: Import the Datadog Agent role from the Datadog collection
   ansible.builtin.import_role:
     name: datadog.dd.agent

ansible/roles/requirements.yml

@@ -2,3 +2,9 @@
 collections:
   - name: datadog.dd
     version: 5.8.0
+  - name: cloud.terraform
+    version: 3.0.0
+  - name: nycmesh.common
+    source: git+https://github.com/nycmeshnet/nycmesh-ansible.git
+    type: git
+    version: main

terraform/ansible.tf

@@ -8,6 +8,7 @@ resource "ansible_group" "monitor_mgt_group" {
     DATADOG_SITE                 = var.datadog_site
     MSM_LOCATION                 = var.msm_location
     VM_HOSTNAME                  = var.hostname
+    local_password               = var.local_password
   }
 }