# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1563090355 18000
# Node ID 3dbfd253c775d5434b6ee4f32e286b362d32cecb
# Parent  13c6ba506f264caa5fe289b25da253d98edd2637
separate disable_stock_users role

diff --git a/group_vars/all.yml b/group_vars/all.yml
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -6,3 +6,7 @@ gui_session: "i3"
 
 dotfiles_default: https://bitbucket.org/merrilymeredith/dotfiles
 dotfiles_default_push: ssh://mhoward@roomag.org/proj/dotfiles
+
+bootstrap_ansible_controller: false
+disable_stock_users: true
+
diff --git a/local.yml b/local.yml
--- a/local.yml
+++ b/local.yml
@@ -2,8 +2,13 @@
 - name: Devbox Setup
   hosts: all
   roles:
-    - role: bootstrap
-      tags: bootstrap
     - devbox
     - user
+  tasks:
+    - include_role:
+        name: bootstrap
+      when: bootstrap_ansible_controller
+    - include_role:
+        name: disable_stock_users
+      when: disable_stock_users
 
diff --git a/roles/bootstrap/defaults/main.yml b/roles/bootstrap/defaults/main.yml
deleted file mode 100644
--- a/roles/bootstrap/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-disable_stock_users: false
-
diff --git a/roles/bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml
--- a/roles/bootstrap/tasks/main.yml
+++ b/roles/bootstrap/tasks/main.yml
@@ -13,7 +13,7 @@
   authorized_key:
     manage_dir: true
     user: ansible
-    key: "{{item}}"
+    key: "{{ item }}"
   with_file:
     - 'public_keys/ansible'
 
@@ -24,6 +24,3 @@
     regexp: '^ansible'
     line: 'ansible ALL=(ALL) NOPASSWD: ALL'
     validate: 'visudo -cf "%s"'
-
-- include: disable-stock.yml
-  when: disable_stock_users
diff --git a/roles/bootstrap/tasks/disable-stock.yml b/roles/disable_stock_users/tasks/main.yml
rename from roles/bootstrap/tasks/disable-stock.yml
rename to roles/disable_stock_users/tasks/main.yml