Move chocolatey setup into separate sls for easier inclusion

2020-01-30 13:14:58 -05:00 · 2020-01-30 13:14:58 -05:00 · 644e5e9eb5
commit 644e5e9eb5
parent 7c4cfda4f4
2 changed files with 13 additions and 11 deletions
--- a/chocolatey.sls
+++ b/chocolatey.sls
@ -0,0 +1,10 @@
+chocolateyBootstrap:
+  module.run:
+    - name: chocolatey.bootstrap
+
+chocolateySource:
+  module.run:
+    - name: chocolatey.add_source
+    - m_name: UCS
+    - source_location: \\ucs\software\nupkg
+    - requires: chocolateyBootstrap
--- a/windowsWorkstation.sls
+++ b/windowsWorkstation.sls
@ -1,12 +1,5 @@
-chocolateyBootstrap:
-  module.run:
-    - name: chocolatey.bootstrap
-
-chocolateySource:
-  module.run:
-    - name: chocolatey.add_source
-    - m_name: UCS
-    - source_location: \\ucs\software\nupkg
+include:
+  - chocolatey

 {% import_yaml "packages.yaml" as packages %}
 {% for pkg in packages %}
@ -14,8 +7,7 @@ chocolateySource:
  chocolatey.installed:
    - name: {{ pkg }}
    - require:
-      - chocolateyBootstrap
-      - chocolateySource
+      - sls: chocolatey
 {% endfor %}

 Upgrade All: