--- a/components/openstack/nova/files/nova-upgrade	Fri Sep 09 13:40:41 2016 -0700
+++ b/components/openstack/nova/files/nova-upgrade	Fri Sep 09 16:49:47 2016 -0400
@@ -91,6 +91,9 @@
     ('osapi_v21', 'project_id_regex'): (None, None),
     ('serial_console', 'listen'): (None, None),
     ('workarounds', 'destroy_after_evacuate'): (None, None),
+    # move noVNC proxy configuration from DEFAULT to the vnc group
+    ('DEFAULT', 'novncproxy_port'): ('vnc', 'novncproxy_port'),
+    ('DEFAULT', 'novncproxy_host'): ('vnc', 'novncproxy_host'),
     # move entries from DEFAULT.nova.virt.solariszones.driver to its own
     # section
     ('DEFAULT', 'boot_volume_type'): ('solariszones', 'boot_volume_type'),
@@ -118,7 +121,6 @@
     ('DEFAULT', 'osapi_compute_workers'),
     ('DEFAULT', 'metadata_workers'),
     ('DEFAULT', 'lock_path'),
-    ('DEFAULT', 'novncproxy_base_url'),
     ('DEFAULT', 'ovs_bridge'),
     ('conductor', 'workers'),
     ('database', 'connection'),
@@ -133,7 +135,7 @@
     ('neutron', 'password'),
     ('neutron', 'tenant_name'),
     ('neutron', 'auth_url'),
-
+    ('vnc', 'novncproxy_base_url'),
 
 ]