Merge "Enable no_parent and file_only security"

nova/cmd/novncproxy.py

@@ -77,6 +77,8 @@ def main():
                                    daemon=CONF.daemon,
                                    record=CONF.record,
                                    web=CONF.web,
+                                   file_only=True,
+                                   no_parent=True,
                                    target_host='ignore',
                                    target_port='ignore',
                                    wrap_mode='exit',

requirements.txt

@@ -28,7 +28,7 @@ python-glanceclient>=0.9.0
 python-keystoneclient>=0.2.0
 six
 stevedore>=0.10
-websockify<0.4
+websockify>=0.5.1,<0.6
 pyparsing>=1.5.7,<2.0 # order-dependent python-quantumclient req, bug 1191866
 
 -f http://tarballs.openstack.org/oslo.config/oslo.config-1.2.0a3.tar.gz#egg=oslo.config-1.2.0a3