Change GUI and GUI2 to be apps rather than core features

Change-Id: I862e5bdbccc29fd78716159e168e7a14bc5053e1
diff --git a/tools/dev/mininet/onos.py b/tools/dev/mininet/onos.py
index f8a0d03..6027180 100755
--- a/tools/dev/mininet/onos.py
+++ b/tools/dev/mininet/onos.py
@@ -99,7 +99,7 @@
     environ[ 'ONOS_USER' ] = defaultUser()
     ONOS_USER = sd( 'ONOS_USER', defaultUser() )
     ONOS_APPS = sd( 'ONOS_APPS',
-                     'drivers,openflow,fwd,proxyarp,mobility' )
+                     'gui,drivers,openflow,fwd,proxyarp,mobility' )
     JAVA_OPTS = sd( 'JAVA_OPTS', '-Xms128m -Xmx512m' )
     # ONOS_WEB_{USER,PASS} isn't respected by onos-karaf:
     environ.update( ONOS_WEB_USER='karaf', ONOS_WEB_PASS='karaf' )
diff --git a/tools/dev/vagrant/ansible/roles/onos-install/templates/one_node_cell.j2 b/tools/dev/vagrant/ansible/roles/onos-install/templates/one_node_cell.j2
index 31bb455..555c099 100644
--- a/tools/dev/vagrant/ansible/roles/onos-install/templates/one_node_cell.j2
+++ b/tools/dev/vagrant/ansible/roles/onos-install/templates/one_node_cell.j2
@@ -1,5 +1,5 @@
 export ONOS_NIC="{{ onos_nic }}"
 export OCI="{{ lxc.lxc_one.ip }}"
 export OC1="{{ lxc.lxc_one.ip }}"
-export ONOS_APPS="drivers,openflow"
-export ONOS_USER="sdn"
\ No newline at end of file
+export ONOS_APPS="gui,drivers,openflow"
+export ONOS_USER="sdn"
diff --git a/tools/dev/vagrant/ansible/roles/onos-install/templates/three_node_cell.j2 b/tools/dev/vagrant/ansible/roles/onos-install/templates/three_node_cell.j2
index 9f5616c..bd9c0ef 100644
--- a/tools/dev/vagrant/ansible/roles/onos-install/templates/three_node_cell.j2
+++ b/tools/dev/vagrant/ansible/roles/onos-install/templates/three_node_cell.j2
@@ -3,5 +3,5 @@
 export OC1="{{ lxc.lxc_one.ip }}"
 export OC2="{{ lxc.lxc_two.ip }}"
 export OC3="{{ lxc.lxc_three.ip }}"
-export ONOS_APPS="drivers,openflow"
-export ONOS_USER="sdn"
\ No newline at end of file
+export ONOS_APPS="gui,drivers,openflow"
+export ONOS_USER="sdn"