diff --git a/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja b/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja index 3e797890a..4d3d33ac2 100644 --- a/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja +++ b/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja @@ -20,7 +20,7 @@ core-{{host}}: master_port: 4506 #startup_states: sls #sls_list: - # - setup.virt.setSalt + # - setup.virt.initial_schedule # - setup.virt.setHostname use_superseded: - module.run @@ -34,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: - # - "systemctl start salt-minion" + file_map: + /opt/so/saltstack/default/salt/setup/virt/initial_schedule.sls: /opt/so/conf/salt/cloud_file_map/salt/initial_schedule.sls + inline_script: + - "sudo salt-call state.apply initial_schedule --local --file-root=/opt/so/conf/salt/cloud_file_map/salt/" # - "rpm --import /tmp/securityonion.pub" # grains to add to the minion diff --git a/salt/salt/master.sls b/salt/salt/master.sls index fc572be96..0dd522e81 100644 --- a/salt/salt/master.sls +++ b/salt/salt/master.sls @@ -58,10 +58,10 @@ salt_master_service: #- salt/cloud/*/requesting # - 'salt/cloud/*/deploying': # - /opt/so/saltstack/default/salt/reactor/createEmptyPillar.sls -# - 'salt/cloud/*/created': -# - /opt/so/saltstack/default/salt/reactor/setSalt.sls -# - /opt/so/saltstack/default/salt/reactor/setHostname.sls -# - /opt/so/saltstack/default/salt/reactor/sominion.sls +## - 'salt/cloud/*/created': +## - /opt/so/saltstack/default/salt/reactor/setSalt.sls +## - /opt/so/saltstack/default/salt/reactor/setHostname.sls +## - /opt/so/saltstack/default/salt/reactor/sominion.sls # - 'setup/so-minion': # - /opt/so/saltstack/default/salt/reactor/sominion_setup.sls # - /opt/so/saltstack/default/salt/reactor/virtUpdate.sls diff --git a/salt/setup/virt/init.sls b/salt/setup/virt/init.sls new file mode 100644 index 000000000..be89c8588 --- /dev/null +++ b/salt/setup/virt/init.sls @@ -0,0 +1,4 @@ +include: + - setup.virt.setSalt + - setup.virt.setHostname + - setup.virt.sominion diff --git a/salt/setup/virt/initial_schedule.sls b/salt/setup/virt/initial_schedule.sls new file mode 100644 index 000000000..7535ee960 --- /dev/null +++ b/salt/setup/virt/initial_schedule.sls @@ -0,0 +1,7 @@ +init_node_schedule: + schedule.present: + - name: init_node + - function: state.sls + - job_args: + - setup.virt.init + - minutes: 1 diff --git a/salt/setup/virt/setSalt.sls b/salt/setup/virt/setSalt.sls index aa6618b25..f777d6005 100644 --- a/salt/setup/virt/setSalt.sls +++ b/salt/setup/virt/setSalt.sls @@ -8,7 +8,10 @@ set_role_grain: - name: role - value: so-{{ grains.id.split("_") | last }} -# set event for firewall rules - so-firewall-minion +# disable the initial schedule +remove_init_node_schedule: + schedule.absent: + - name: init_node set_highstate: file.append: