diff --git a/chef/databags/openstack/openstack.json b/chef/databags/openstack/openstack.json
index e39d157..4d5d222 100644
--- a/chef/databags/openstack/openstack.json
+++ b/chef/databags/openstack/openstack.json
@@ -5,8 +5,9 @@
       "os-ops-messaging": "openstack message queue node",
       "os-image": "openstack image node",
       "os-ops-database": "openstack database node",
-      "os-compute-worker": "openstack nova node",
-      "os-ha": "Software load balance node"
+      "os-compute-worker": "openstack compute node",
+      "os-ha": "Software load balance node",
+      "os-compute-vncproxy": "vnc proxy"
     },
   "test_roles": {
       "default": ["test-synclog"]
@@ -47,7 +48,6 @@
   "role_mapping": {
       "os-controller": {
           "/endpoints/compute/metadata/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
-          "/endpoints/compute/novnc/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
           "/endpoints/compute/service/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
           "/endpoints/compute/xvpvnc/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
           "/endpoints/ec2/admin/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
@@ -58,6 +58,9 @@
           "/endpoints/network/service/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
           "/endpoints/volume/service/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"]
         },
+      "os-compute-vncproxy": {
+          "/endpoints/compute/novnc/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"]
+        },
       "os-ops-database": {
           "/db/mysql/bind_address": "/networking/interfaces/management/ip"
         },
@@ -254,6 +257,7 @@
               "os-ops-database",
               "os-ops-messaging",
               "os-controller",
+              "os-compute-vncproxy",
               "os-image",
               "os-block-storage-worker",
               "os-network",
@@ -281,6 +285,7 @@
                   "os-ops-database",
                   "os-ops-messaging",
                   "os-controller",
+                  "os-compute-vncproxy",
                   "os-image",
                   "os-block-storage-worker",
                   "os-network",
diff --git a/chef/roles/os-controller.rb b/chef/roles/os-controller.rb
index b114378..7338fcd 100644
--- a/chef/roles/os-controller.rb
+++ b/chef/roles/os-controller.rb
@@ -12,6 +12,6 @@ run_list(
     'role[os-compute-cert]', 
     'role[os-compute-controller]', 
     'role[os-compute-scheduler]', 
-    'role[os-compute-vncproxy]', 
+#    'role[os-compute-vncproxy]', 
     'role[os-network-server]'
   )