diff --git a/roles/head-node/files/connect-switch.yml b/roles/head-node/files/connect-switch.yml
new file mode 100644
index 0000000..da4edb0
--- /dev/null
+++ b/roles/head-node/files/connect-switch.yml
@@ -0,0 +1,35 @@
+---
+- name: Locate all switches
+  hosts: localhost
+  tasks:
+    - name: Lookup DHCP harvest
+      shell: cat /etc/bind/maas/dhcp_harvest.inc | grep -i " cc:37:ab\| 70:72;cf" | awk '{print $1}'
+      register: switches
+    - name: Add hosts into inventory
+      add_host: name={{item}} group=fabric
+      with_items: "{{switches.stdout_lines}}"
+
+- name: Connect all fabric switches to onos-fabric
+  hosts: fabric
+  remote_user: root
+  tasks:
+    - name: Check the status of indigo agent
+      command: ps aux
+      changed_when: false
+      register: status
+
+    - name: Terminate indigo agent
+      command: /root/killit
+      when: status.stdout.find('brcm-indigo-ofdpa-ofagent') != -1
+
+    - name: Purge hardware tables
+      command: /root/purge
+
+    - name: Start indigo agent
+      command: /root/connect -bg
+
+    - name: Verify indigo agent has been started
+      command: ps aux
+      changed_when: false
+      register: status
+      failed_when: status.stdout.find('brcm-indigo-ofdpa-ofagent') == -1
diff --git a/roles/head-node/tasks/main.yml b/roles/head-node/tasks/main.yml
index d8a535e..e050556 100644
--- a/roles/head-node/tasks/main.yml
+++ b/roles/head-node/tasks/main.yml
@@ -50,7 +50,7 @@
   register: apikey
   changed_when: false
 
-- name: Ensure Compute Node Playbook
+- name: Ensure Playbooks
   become: yes
   template:
     src=files/{{ item }}
@@ -61,6 +61,7 @@
   with_items:
     - compute-node.yml
     - switch-node.yml
+    - connect-switch.yml
 
 - name: Ensure Dynamic Inventory Script
   become: yes