back to foreman.conf

docker-compose.yml

@@ -46,8 +46,8 @@ services:
         target: "/github.com/smart-proxy/config/settings.d/salt.yml"
       - source: dynflow-yml
         target: "/github.com/smart-proxy/config/settings.d/dynflow.yml"
-      - source: foreman-salt-master-yml
-        target: "/etc/salt/master.d/foreman-salt-master.yml"
+      - source: foreman-conf
+        target: "/etc/salt/master.d/foreman.conf"
       - source: foreman-yaml
         target: "/etc/salt/foreman.yaml"
       - source: supervisor-conf
@@ -147,8 +147,8 @@ configs:
     file: "./etc_master/foreman-proxy/settings.d/salt.yml"
   dynflow-yml:
     file: "./etc_master/foreman-proxy/settings.d/dynflow.yml"
-  foreman-salt-master-yml:
-    file: "./etc_master/salt/master.d/foreman-salt-master.yml"
+  foreman-conf:
+    file: "./etc_master/salt/master.d/foreman.conf"
   foreman-yaml:
     file: "./etc_master/salt/foreman.yaml"
   supervisor-conf:

etc_master/salt/master.d/foreman.conf

@@ -0,0 +1,79 @@
+master_tops:
+  ext_nodes: /github.com/smart_proxy_salt/bin/foreman-node
+
+ext_pillar:
+  - puppet: /github.com/smart_proxy_salt/bin/foreman-node
+
+autosign_file: /etc/salt/autosign.conf
+
+autosign_grains_dir: /var/lib/foreman-proxy/salt/grains
+
+# reactor:
+#   - 'salt/auth':
+#     - /var/lib/foreman-proxy/salt/reactors/foreman_minion_auth.sls
+
+# /etc/salt/master.d/foreman.config Example configuration
+#
+# This file summarizes configurations for the salt-master. Modify directories and
+# parameters to fit your setup. When you're done, remove the .example from the
+# filename so the salt-master will make use of it.
+# Have a look at the [Foreman Salt Plugin Documentation](https://theforeman.org/plugins/foreman_salt/) for detailed explanations.
+#
+# After editing this file, run the following command to active the changes:
+# $ systemctl restart salt-master
+
+
+##
+# Autosign
+#autosign_grains_dir: /var/lib/foreman-proxy/salt/grains
+#autosign_file: /etc/salt/autosign.conf
+# Uncomment the next line to make use of the autosign host name file (not recommended)
+# permissive_pki_access: True
+
+
+##
+# Node classifier
+#master_tops:
+#  ext_nodes: /usr/bin/foreman-node
+
+
+##
+# Pillar data access
+#ext_pillar:
+#  - puppet: /usr/bin/foreman-node
+
+
+##
+# Salt API access
+#external_auth:
+#  pam:
+#    saltuser: # Username of your salt user
+#      - '@runner'
+
+#rest_cherrypy:
+#  port: 9191
+#  ssl_key: /etc/puppet/example.key # Add the path to your Puppet ssl key here
+#  ssl_crt: /etc/puppet/example.crt # Add the path to your Puppet ssl certificate here
+
+
+##
+# Remote execution provider
+#publisher_acl:
+#  foreman-proxy:
+#    - state.template_str
+
+
+##
+# Salt environment (optional)
+#file_roots:
+#  base:
+#   - /srv/salt
+
+
+##
+# Reactors
+#reactor:
+#  - 'salt/auth': # Autosign reactor
+#    - /var/lib/foreman-proxy/salt/reactors/foreman_minion_auth.sls
+#  - 'salt/job/*/ret/*': # Report reactor
+#    - /var/lib/foreman-proxy/salt/reactors/foreman_report_upload.sls

foreman-conf-configmap.yaml

@@ -0,0 +1,88 @@
+apiVersion: v1
+data:
+  foreman.conf: |
+    master_tops:
+      ext_nodes: /github.com/smart_proxy_salt/bin/foreman-node
+
+    ext_pillar:
+      - puppet: /github.com/smart_proxy_salt/bin/foreman-node
+
+    autosign_file: /etc/salt/autosign.conf
+
+    autosign_grains_dir: /var/lib/foreman-proxy/salt/grains
+
+    # reactor:
+    #   - 'salt/auth':
+    #     - /var/lib/foreman-proxy/salt/reactors/foreman_minion_auth.sls
+
+    # /etc/salt/master.d/foreman.config Example configuration
+    #
+    # This file summarizes configurations for the salt-master. Modify directories and
+    # parameters to fit your setup. When you're done, remove the .example from the
+    # filename so the salt-master will make use of it.
+    # Have a look at the [Foreman Salt Plugin Documentation](https://theforeman.org/plugins/foreman_salt/) for detailed explanations.
+    #
+    # After editing this file, run the following command to active the changes:
+    # $ systemctl restart salt-master
+
+
+    ##
+    # Autosign
+    #autosign_grains_dir: /var/lib/foreman-proxy/salt/grains
+    #autosign_file: /etc/salt/autosign.conf
+    # Uncomment the next line to make use of the autosign host name file (not recommended)
+    # permissive_pki_access: True
+
+
+    ##
+    # Node classifier
+    #master_tops:
+    #  ext_nodes: /usr/bin/foreman-node
+
+
+    ##
+    # Pillar data access
+    #ext_pillar:
+    #  - puppet: /usr/bin/foreman-node
+
+
+    ##
+    # Salt API access
+    #external_auth:
+    #  pam:
+    #    saltuser: # Username of your salt user
+    #      - '@runner'
+
+    #rest_cherrypy:
+    #  port: 9191
+    #  ssl_key: /etc/puppet/example.key # Add the path to your Puppet ssl key here
+    #  ssl_crt: /etc/puppet/example.crt # Add the path to your Puppet ssl certificate here
+
+
+    ##
+    # Remote execution provider
+    #publisher_acl:
+    #  foreman-proxy:
+    #    - state.template_str
+
+
+    ##
+    # Salt environment (optional)
+    #file_roots:
+    #  base:
+    #   - /srv/salt
+
+
+    ##
+    # Reactors
+    #reactor:
+    #  - 'salt/auth': # Autosign reactor
+    #    - /var/lib/foreman-proxy/salt/reactors/foreman_minion_auth.sls
+    #  - 'salt/job/*/ret/*': # Report reactor
+    #    - /var/lib/foreman-proxy/salt/reactors/foreman_report_upload.sls
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: salt
+  name: foreman-conf

salt-deployment.yaml

@@ -67,9 +67,9 @@ spec:
             - mountPath: /github.com/smart-proxy/config/settings.d/dynflow.yml
               name: dynflow-yml
               subPath: dynflow.yml
-            - mountPath: /etc/salt/master.d/foreman-salt-master.yml
-              name: foreman-salt-master-yml
-              subPath: foreman-salt-master.yml
+            - mountPath: /etc/salt/master.d/foreman.conf
+              name: foreman-conf
+              subPath: foreman.conf
             - mountPath: /etc/salt/foreman.yaml
               name: foreman-yaml
               subPath: foreman.yaml
@@ -128,10 +128,10 @@ spec:
           name: dynflow-yml
         - configMap:
             items:
-              - key: foreman-salt-master.yml
-                path: foreman-salt-master.yml
-            name: foreman-salt-master-yml
-          name: foreman-salt-master-yml
+              - key: foreman.conf
+                path: foreman.conf
+            name: foreman-conf
+          name: foreman-conf
         - configMap:
             items:
               - key: foreman.yaml