From 64bf7eb363268ed0eddcade2c79afac90700da5d Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 20 Aug 2024 15:26:05 -0400
Subject: [PATCH] hyper

---
 salt/repo/client/oracle.sls                   |  2 +
 .../cloud/cloud.profiles.d/socloud.conf.jinja |  9 ++--
 salt/setup/virt/setHostname.sls               | 50 ++++++++++---------
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/salt/repo/client/oracle.sls b/salt/repo/client/oracle.sls
index 8b55964f4..89d41beae 100644
--- a/salt/repo/client/oracle.sls
+++ b/salt/repo/client/oracle.sls
@@ -53,10 +53,12 @@ so_repo:
     - baseurl: file:///nsm/repo/
   {% else %}
     - baseurl: https://{{ GLOBALS.repo_host }}/repo
+    - sslverify: 0
   {% endif %}
     - enabled: 1
     - gpgcheck: 1
 
+
 {% endif %}
   
 # TODO: Add a pillar entry for custom repos
diff --git a/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja b/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja
index 21d050d88..c8db663af 100644
--- a/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja
+++ b/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja
@@ -21,6 +21,7 @@ core-{{host}}:
     startup_states: sls
     sls_list:
       - setup.virt.setHostname
+      - salt.minion
     use_superseded:
       - module.run
     features:
@@ -33,10 +34,10 @@ core-{{host}}:
   #preflight_cmds:
   #  - echo "preflight_cmds"
   # the destination directory will be created if it doesn't exist
-  file_map:
-    /opt/so/saltstack/default/salt/repo/client/files/oracle/keys/securityonion.pub: /tmp/securityonion.pub
-  inline_script:
-    - "rpm --import /tmp/securityonion.pub"
+  #file_map:
+  #  /opt/so/saltstack/default/salt/repo/client/files/oracle/keys/securityonion.pub: /tmp/securityonion.pub
+  #inline_script:
+  #  - "rpm --import /tmp/securityonion.pub"
   # grains to add to the minion
 
 {%-   endfor %}
diff --git a/salt/setup/virt/setHostname.sls b/salt/setup/virt/setHostname.sls
index 5654b859f..3dd20098f 100644
--- a/salt/setup/virt/setHostname.sls
+++ b/salt/setup/virt/setHostname.sls
@@ -6,36 +6,14 @@
 {% from 'setup/virt/soinstall.map.jinja' import DATA %}
 
 setHostname_{{grains.id.split("_") | first}}:
+  cmd.run:
+    - name: hostnamectl set-hostname --static {{grains.id.split("_") | first}}
   network.system:
     - name: {{grains.id.split("_") | first}}
     - enabled: True
     - hostname: {{grains.id.split("_") | first}}
     - apply_hostname: True
 
-create_pillar:
-  event.send:
-    - name: setup/so-minion
-    - data:
-        HYPERVISOR_HOST: {{ grains.hypervisor_host }}
-        MAINIP: {{ DATA.MAINIP }}
-        MNIC: {{ DATA.MNIC }}
-        NODE_DESCRIPTION: '{{ DATA.NODE_DESCRIPTION }}'
-        ES_HEAP_SIZE: {{ DATA.ES_HEAP_SIZE }}
-        PATCHSCHEDULENAME: {{ DATA.PATCHSCHEDULENAME }}
-        INTERFACE: {{ DATA.INTERFACE }}
-        NODETYPE: {{ DATA.NODETYPE }}
-        CORECOUNT: {{ DATA.CORECOUNT }}
-        LSHOSTNAME: {{ DATA.LSHOSTNAME }}
-        LSHEAP: {{ DATA.LSHEAP }}
-        CPUCORES: {{ DATA.CPUCORES }}
-        IDH_MGTRESTRICT: {{ DATA.IDH_MGTRESTRICT }}
-        IDH_SERVICES: {{ DATA.IDH_SERVICES }}
-        CPU: {{ DATA.CPU }}
-        MEMORY: {{ DATA.MEMORY }}
-        DISKS: {{ DATA.DISKS }}
-        COPPER: {{ DATA.COPPER }}
-        SFP: {{ DATA.SFP }}
-
 set_role_grain:
   grains.present:
     - name: role
@@ -64,3 +42,27 @@ set_highstate:
     - repl: 'startup_states: highstate'
     - onchanges:
       - file: clean_setHostname
+
+create_pillar:
+  event.send:
+    - name: setup/so-minion
+    - data:
+        HYPERVISOR_HOST: {{ grains.hypervisor_host }}
+        MAINIP: {{ DATA.MAINIP }}
+        MNIC: {{ DATA.MNIC }}
+        NODE_DESCRIPTION: '{{ DATA.NODE_DESCRIPTION }}'
+        ES_HEAP_SIZE: {{ DATA.ES_HEAP_SIZE }}
+        PATCHSCHEDULENAME: {{ DATA.PATCHSCHEDULENAME }}
+        INTERFACE: {{ DATA.INTERFACE }}
+        NODETYPE: {{ DATA.NODETYPE }}
+        CORECOUNT: {{ DATA.CORECOUNT }}
+        LSHOSTNAME: {{ DATA.LSHOSTNAME }}
+        LSHEAP: {{ DATA.LSHEAP }}
+        CPUCORES: {{ DATA.CPUCORES }}
+        IDH_MGTRESTRICT: {{ DATA.IDH_MGTRESTRICT }}
+        IDH_SERVICES: {{ DATA.IDH_SERVICES }}
+        CPU: {{ DATA.CPU }}
+        MEMORY: {{ DATA.MEMORY }}
+        DISKS: {{ DATA.DISKS }}
+        COPPER: {{ DATA.COPPER }}
+        SFP: {{ DATA.SFP }}