add .sls files

docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - "8000:8000"
       - "9000:9000"
       - "1234:1234"
-    entrypoint: ["/bin/sh", "-c" , "mkdir -p /etc/salt/pki/master/minions && cp /tmp/docker-salt-minion /etc/salt/pki/master/minions && /usr/bin/supervisord"]
+    entrypoint: ["/bin/sh", "-c" , "mkdir -p /srv/salt && tar -xzvf /tmp/salt-files.tar.gz -C /srv/salt && mkdir -p /etc/salt/pki/master/minions && cp /tmp/docker-salt-minion /etc/salt/pki/master/minions && /usr/bin/supervisord"]
     #entrypoint: ["mkdir -p /etc/salt/pki/master/minions"] # && cp /tmp/docker-salt-minion /etc/salt/pki/master/minions"] #  && /usr/bin/supervisord"]
 #    entrypoint: /usr/bin/dumb-init /usr/local/bin/saltinit
 #    volumes:
@@ -52,6 +52,14 @@ services:
         target: "/etc/salt/foreman.yaml"
       - source: supervisor-conf
         target: "/etc/supervisor/supervisord.conf"
+      - source: salt-files
+        target: "/tmp/salt-files.tar.gz"
+      - source: pillar-top
+        target: "/srv/pillar/top.sls"
+      - source: pillar-default
+        target: "/srv/pillar/default.sls"
+      - source: pillar-raspberry
+        target: "/srv/pillar/raspberrypi.sls"
     environment:
       - SALT_SHARED_SECRET=GCUrcjS8J5wrcdtbWpjV
       - 'SALT_MASTER_CONFIG={
@@ -145,3 +153,11 @@ configs:
     file: "./etc_master/salt/foreman.yaml"
   supervisor-conf:
     file: "./etc_master/supervisor/supervisord.conf"
+  salt-files:
+    file: "./srv/salt/salt-files.tar.gz"
+  pillar-top:
+    file: "./srv/pillar/top.sls"
+  pillar-default:
+    file: "./srv/pillar/default.sls"
+  pillar-raspberry:
+    file: "./srv/pillar/raspberrypi.sls"

foreman-salt-master-yml-configmap.yaml

@@ -1,6 +1,85 @@
 apiVersion: v1
-binaryData:
-  foreman-salt-master.yml: YldGemRHVnlYM1J2Y0hNNkRRb2dJR1Y0ZEY5dWIyUmxjem9nTDJkcGRHaDFZaTVqYjIwdmMyMWhjblJmY0hKdmVIbGZjMkZzZEM5aWFXNHZabTl5WlcxaGJpMXViMlJsRFFvTkNtVjRkRjl3YVd4c1lYSTZEUW9nSUMwZ2NIVndjR1YwT2lBdloybDBhSFZpTG1OdmJTOXpiV0Z5ZEY5d2NtOTRlVjl6WVd4MEwySnBiaTltYjNKbGJXRnVMVzV2WkdVTkNnMEtZWFYwYjNOcFoyNWZabWxzWlRvZ0wyVjBZeTl6WVd4MEwyRjFkRzl6YVdkdUxtTnZibVlOQ2cwS1lYVjBiM05wWjI1ZlozSmhhVzV6WDJScGNqb2dMM1poY2k5c2FXSXZabTl5WlcxaGJpMXdjbTk0ZVM5ellXeDBMMmR5WVdsdWN3MEtEUW9qSUhKbFlXTjBiM0k2RFFvaklDQWdMU0FuYzJGc2RDOWhkWFJvSnpvTkNpTWdJQ0FnSUMwZ0wzWmhjaTlzYVdJdlptOXlaVzFoYmkxd2NtOTRlUzl6WVd4MEwzSmxZV04wYjNKekwyWnZjbVZ0WVc1ZmJXbHVhVzl1WDJGMWRHZ3VjMnh6RFFvTkNpTWdMMlYwWXk5ellXeDBMMjFoYzNSbGNpNWtMMlp2Y21WdFlXNHVZMjl1Wm1sbklFVjRZVzF3YkdVZ1kyOXVabWxuZFhKaGRHbHZiZzBLSXcwS0l5QlVhR2x6SUdacGJHVWdjM1Z0YldGeWFYcGxjeUJqYjI1bWFXZDFjbUYwYVc5dWN5Qm1iM0lnZEdobElITmhiSFF0YldGemRHVnlMaUJOYjJScFpua2daR2x5WldOMGIzSnBaWE1nWVc1a0RRb2pJSEJoY21GdFpYUmxjbk1nZEc4Z1ptbDBJSGx2ZFhJZ2MyVjBkWEF1SUZkb1pXNGdlVzkxSjNKbElHUnZibVVzSUhKbGJXOTJaU0IwYUdVZ0xtVjRZVzF3YkdVZ1puSnZiU0IwYUdVTkNpTWdabWxzWlc1aGJXVWdjMjhnZEdobElITmhiSFF0YldGemRHVnlJSGRwYkd3Z2JXRnJaU0IxYzJVZ2IyWWdhWFF1RFFvaklFaGhkbVVnWVNCc2IyOXJJR0YwSUhSb1pTQmJSbTl5WlcxaGJpQlRZV3gwSUZCc2RXZHBiaUJFYjJOMWJXVnVkR0YwYVc5dVhTaG9kSFJ3Y3pvdkwzUm9aV1p2Y21WdFlXNHViM0puTDNCc2RXZHBibk12Wm05eVpXMWhibDl6WVd4MEx5a2dabTl5SUdSbGRHRnBiR1ZrSUdWNGNHeGhibUYwYVc5dWN5NE5DaU1OQ2lNZ1FXWjBaWElnWldScGRHbHVaeUIwYUdseklHWnBiR1VzSUhKMWJpQjBhR1VnWm05c2JHOTNhVzVuSUdOdmJXMWhibVFnZEc4Z1lXTjBhWFpsSUhSb1pTQmphR0Z1WjJWek9nMEtJeUFrSUhONWMzUmxiV04wYkNCeVpYTjBZWEowSUhOaGJIUXRiV0Z6ZEdWeURRb05DZzBLSXlNTkNpTWdRWFYwYjNOcFoyNE5DaU5oZFhSdmMybG5ibDluY21GcGJuTmZaR2x5T2lBdmRtRnlMMnhwWWk5bWIzSmxiV0Z1TFhCeWIzaDVMM05oYkhRdlozSmhhVzV6RFFvallYVjBiM05wWjI1ZlptbHNaVG9nTDJWMFl5OXpZV3gwTDJGMWRHOXphV2R1TG1OdmJtWU5DaU1nVlc1amIyMXRaVzUwSUhSb1pTQnVaWGgwSUd4cGJtVWdkRzhnYldGclpTQjFjMlVnYjJZZ2RHaGxJR0YxZEc5emFXZHVJR2h2YzNRZ2JtRnRaU0JtYVd4bElDaHViM1FnY21WamIyMXRaVzVrWldRcERRb2pJSEJsY20xcGMzTnBkbVZmY0d0cFgyRmpZMlZ6Y3pvZ1ZISjFaUTBLRFFvTkNpTWpEUW9qSUU1dlpHVWdZMnhoYzNOcFptbGxjZzBLSTIxaGMzUmxjbDkwYjNCek9nMEtJeUFnWlhoMFgyNXZaR1Z6T2lBdmRYTnlMMkpwYmk5bWIzSmxiV0Z1TFc1dlpHVU5DZzBLRFFvakl3MEtJeUJRYVd4c1lYSWdaR0YwWVNCaFkyTmxjM01OQ2lObGVIUmZjR2xzYkdGeU9nMEtJeUFnTFNCd2RYQndaWFE2SUM5MWMzSXZZbWx1TDJadmNtVnRZVzR0Ym05a1pRMEtEUW9OQ2lNakRRb2pJRk5oYkhRZ1FWQkpJR0ZqWTJWemN3MEtJMlY0ZEdWeWJtRnNYMkYxZEdnNkRRb2pJQ0J3WVcwNkRRb2pJQ0FnSUhOaGJIUjFjMlZ5T2lBaklGVnpaWEp1WVcxbElHOW1JSGx2ZFhJZ2MyRnNkQ0IxYzJWeURRb2pJQ0FnSUNBZ0xTQW5RSEoxYm01bGNpY05DZzBLSTNKbGMzUmZZMmhsY25KNWNIazZEUW9qSUNCd2IzSjBPaUE1TVRreERRb2pJQ0J6YzJ4ZmEyVjVPaUF2WlhSakwzQjFjSEJsZEM5bGVHRnRjR3hsTG10bGVTQWpJRUZrWkNCMGFHVWdjR0YwYUNCMGJ5QjViM1Z5SUZCMWNIQmxkQ0J6YzJ3Z2EyVjVJR2hsY21VTkNpTWdJSE56YkY5amNuUTZJQzlsZEdNdmNIVndjR1YwTDJWNFlXMXdiR1V1WTNKMElDTWdRV1JrSUhSb1pTQndZWFJvSUhSdklIbHZkWElnVUhWd2NHVjBJSE56YkNCalpYSjBhV1pwWTJGMFpTQm9aWEpsRFFvTkNnMEtJeU1OQ2lNZ1VtVnRiM1JsSUdWNFpXTjFkR2x2YmlCd2NtOTJhV1JsY2cwS0kzQjFZbXhwYzJobGNsOWhZMnc2RFFvaklDQm1iM0psYldGdUxYQnliM2g1T2cwS0l5QWdJQ0F0SUhOMFlYUmxMblJsYlhCc1lYUmxYM04wY2cwS0RRb05DaU1qRFFvaklGTmhiSFFnWlc1MmFYSnZibTFsYm5RZ0tHOXdkR2x2Ym1Gc0tRMEtJMlpwYkdWZmNtOXZkSE02RFFvaklDQmlZWE5sT2cwS0l5QWdJQzBnTDNOeWRpOXpZV3gwRFFvTkNnMEtJeU1OQ2lNZ1VtVmhZM1J2Y25NTkNpTnlaV0ZqZEc5eU9nMEtJeUFnTFNBbmMyRnNkQzloZFhSb0p6b2dJeUJCZFhSdmMybG5iaUJ5WldGamRHOXlEUW9qSUNBZ0lDMGdMM1poY2k5c2FXSXZabTl5WlcxaGJpMXdjbTk0ZVM5ellXeDBMM0psWVdOMGIzSnpMMlp2Y21WdFlXNWZiV2x1YVc5dVgyRjFkR2d1YzJ4ekRRb2pJQ0F0SUNkellXeDBMMnB2WWk4cUwzSmxkQzhxSnpvZ0l5QlNaWEJ2Y25RZ2NtVmhZM1J2Y2cwS0l5QWdJQ0F0SUM5MllYSXZiR2xpTDJadmNtVnRZVzR0Y0hKdmVIa3ZjMkZzZEM5eVpXRmpkRzl5Y3k5bWIzSmxiV0Z1WDNKbGNHOXlkRjkxY0d4dllXUXVjMnh6RFFvPQ==
+data:
+  foreman-salt-master.yml: |
+    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

pillar-default-configmap.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+data:
+  default.sls: |
+    http: curl
+    git-personal-access-token: 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
+    mqtt-password: hdC1w.zOi_AJ-8k+o^J-EU#LqF|4k1GzM
+    user: root
+    group: root
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: salt
+  name: pillar-default

pillar-raspberry-configmap.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+data:
+  raspberrypi.sls: |
+    user: pi
+    group: pi
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: salt
+  name: pillar-raspberry

pillar-top-configmap.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+data:
+  top.sls: |
+    base:
+      '*':
+        - default
+      '*raspberry*':
+        - raspberrypi
+      '*linksmart*':
+        - raspberrypi
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: salt
+  name: pillar-top

salt-deployment.yaml

@@ -31,7 +31,7 @@ spec:
         - command:
             - /bin/sh
             - -c
-            - mkdir -p /etc/salt/pki/master/minions && cp /tmp/docker-salt-minion /etc/salt/pki/master/minions && /usr/bin/supervisord
+            - mkdir -p /srv/salt && tar -xzvf /tmp/salt-files.tar.gz -C /srv/salt && mkdir -p /etc/salt/pki/master/minions && cp /tmp/docker-salt-minion /etc/salt/pki/master/minions && /usr/bin/supervisord
           env:
             - name: SALT_API_CONFIG
               value: '{ "rest_cherrypy":{ "port":8000, "disable_ssl":true }, "external_auth":{ "sharedsecret":{ "salt":[ ".*", "@wheel", "@jobs", "@runner" ] } }, "sharedsecret":"GCUrcjS8J5wrcdtbWpjV" } '
@@ -76,6 +76,18 @@ spec:
             - mountPath: /etc/supervisor/supervisord.conf
               name: supervisor-conf
               subPath: supervisord.conf
+            - mountPath: /tmp/salt-files.tar.gz
+              name: salt-files
+              subPath: salt-files.tar.gz
+            - mountPath: /srv/pillar/top.sls
+              name: pillar-top
+              subPath: top.sls
+            - mountPath: /srv/pillar/default.sls
+              name: pillar-default
+              subPath: default.sls
+            - mountPath: /srv/pillar/raspberrypi.sls
+              name: pillar-raspberry
+              subPath: raspberrypi.sls
       restartPolicy: Always
       volumes:
         - configMap:
@@ -132,4 +144,28 @@ spec:
                 path: supervisord.conf
             name: supervisor-conf
           name: supervisor-conf
+        - configMap:
+            items:
+              - key: salt-files.tar.gz
+                path: salt-files.tar.gz
+            name: salt-files
+          name: salt-files
+        - configMap:
+            items:
+              - key: top.sls
+                path: top.sls
+            name: pillar-top
+          name: pillar-top
+        - configMap:
+            items:
+              - key: default.sls
+                path: default.sls
+            name: pillar-default
+          name: pillar-default
+        - configMap:
+            items:
+              - key: raspberrypi.sls
+                path: raspberrypi.sls
+            name: pillar-raspberry
+          name: pillar-raspberry
 status: {}

salt-files-configmap.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+binaryData:
+  salt-files.tar.gz: H4sIAAAAAAAAA+1aX2/bNhD3swF/hwP6YKCAJFvyn81ABmxpH/ZQtFtT7GEYDFqibdYSqZBUErfod99RsiRLTiMDs51m0L04Oh6Pd9T9eMdTbGchhLZ8wZdsZatQdU5PA6TpdGp+h9PxYP83JW8w6gxH7nDkTUbe1OsMht7YG3ZgcAZbDihRmkiAzj2RnOjvyzWNv1D6xH0RRZRrxlcQ6JhIEs16XYAlC6md5KMpC8ACTiI6gzRonF3Q6Aedj0q6og+zXM8Vc/05kdGV4L1ur/uWk0VolkmI1OUaJI4pD45cQNMHPQNqNNG50XM17HWfew9fMtmOHwpOraUUkbVi+hxHQBP+Jwj2Kv5HQxxu8X8BenVtXj/oNYVobX0Z/owYjgUshUx51+9dUJQrIRGgrwBMhIREU6Wz5xKxa61jNXMclFgnCxvPDecTDcgN2dBtsmFOpr2YhJu+oghlZy0i6sRsN68Q63VLw9CAYL5OIhYwvYVYsju0ILUzPTUqNjWY9JlwzlT2Lp2KXhulilPmO8ZVJuTC6SrzRFE5g3311fGYKDWDr18hZmFI5N99VGnFVCrBSWgR36dKWVpsKO//A9++XexQQ/xLiptnBUxSXwu5Pf0J0Jj/D/E/nrb4vwhdp28flpKqNRQxUOAfoxTSBAHE10xwBYzDG+FvqCwzeDGtnsRr8MlHM6zsYcEwdmGfSaykSOIqXAynIhOJANeYjscFA48aNAVhdiMT+twb+0LI4F/wMxX+O2rAvzseuTX8u+7UbfF/CSJBANGt1mAS1L2QARCF9fUd3BHJTJWdYjqNEeTOYzwnDq8D7/64uZl/+PXjx7/e//nmeJTfkTChFRFjiZVbspPtdY2N1RrA2FMa9rhRTybvWu7Hs8/9xQnoncOTMMz1sMDci5bM+PFo6m92MWI80WhM/7Xj9iu+aBph+ic6kfRU7uypPNajvSmncMqYrk7oUa7vWHdy+VP44sfJOV5STe2xntWmncRB4Z7MKeEe7Yhw/6PxnK3WOtziBcA0CZqsV0kgdqLAxX2TjTvlVjbjeEvXIkEJr2744EfvTtgOlnKchhaWUwnWcucoBJrq/6FXz/+jwWTc5v9LkAEUc33IogCyKEghtMG/DzCFPLV7SJHj+nNEUz5q7rMMr+Gg2wL8hZDtxFu9FhyrLn9DVlSd4QRovP+PvTr+R+6oxf8l6HeO/ochfEijAHZRUNz/s94f/PburfvTIAV+zGKbZZNovWsvY2YvIoqiOX/B+BzvDZjBnURJBx+xkIi9NJc3LF1pPT69bt40fHrN597qH5JsR9LbhEkaWFqI8Bzwb8b/5CD/e4M2/1+EchDmUQBpFGSI26weQRxy9yuAvZrYNLr3auK0j5f31M3D59tK4ZDFW8mKhEITtBaWHzKsOfaGTHlfPmUJyztgWIjykmnKl/KzZNrfbOuSQ7IdLeLztv8a8e96k3r/b9h+/78MLYjKyv3+6/6sxMt+Ssi59Q9FBb/yAbk4J6plZc6u3DaLjF3+C0q5mIH8c+9OSy211NL/l/4FepN5cAAoAAA=
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: salt
+  name: salt-files