From 644e5e9eb50daceb239e6057f0fde3e46bb03daa Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Thu, 30 Jan 2020 13:14:58 -0500
Subject: [PATCH] Move chocolatey setup into separate sls for easier inclusion

---
 chocolatey.sls         | 10 ++++++++++
 windowsWorkstation.sls | 14 +++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 chocolatey.sls

diff --git a/chocolatey.sls b/chocolatey.sls
new file mode 100644
index 0000000..aa9705b
--- /dev/null
+++ 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
diff --git a/windowsWorkstation.sls b/windowsWorkstation.sls
index 5729ef5..2300b68 100644
--- 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: