Commit Graph

11 Commits

Author SHA1 Message Date
唐飞雄 (twitter: @tangfx) b6bebb46ca Revert "Merge from upstream" 2017-08-04 18:44:41 -07:00
Solly Ross 6f5148648b Remove local copies of websockify
This commit removes local copies of websockify.
Instead `utils/launch.sh` performs the following logic:

If `utils/websockify` exists, use `utils/websockify/run` (if the latter
does not exist, or is not executable, fail, since this is probably a
mistake).

Otherwise, check to see if websockify is installed somewhere (try
`which websockify`).  If it is, use that.  Otherwise, clone
websockify from github, and tell git to ignore that directory.

Packaged versions of noVNC should simply list websockify as a
requirement.  The debian packaging has been updated to reflect
this.

Closes #433
2015-02-16 17:09:58 -05:00
Joel Martin 7c1cd93744 Remove references to wsproxy.
Also, update nova-novncproxy to import websockify instead of wsproxy.
2013-04-15 12:22:34 -05:00
Nikola Dipanov de0f8773b1 Import cfg from oslo in nova-novncproxy
Upstram OpenStack Nova package has moved the config engine into a
separate package. Mirror that change in the novnc script.
2013-04-08 15:42:56 +02:00
Nikhil Komawar 902c6fb37f Changed the config module which includes CONF
currently CONF was attempted of being imported from nova config.py
rather than openstack/common/cfg.py. this commit fixes that.
2012-11-30 11:50:57 -05:00
Terry Wilson f167ea0ecc Mirror FLAGS->CONF change in Nova
Nova recently removed parse_args from flags.py. This updates the
nova proxy to properly use CONF instead of FLAGS.
2012-11-08 17:49:12 -05:00
Soheil Hassas Yeganeh 90f18a8a96 Fixes nova rpc package. 2012-06-21 21:38:52 -04:00
Soheil Hassas Yeganeh 9e2351f5eb Switch to nova's new flag API. 2012-06-06 21:26:25 -03:00
Anthony Young ca78183171 Use explicit check for rpc.register_opts 2012-04-30 14:07:31 -07:00
Anthony Young 901e565503 Update to fix trunk nova issue with rpc library
* rpc flags now must be manually initialized.
2012-04-30 13:34:57 -07:00
Anthony Young 4c75210a4d Add nova-novncproxy
* Adds the nova-novncproxy binary, to provide support for vnc + OpensStack nova
 * Adds the ability to pass an auth token in via url, which is subsequently
   passed back to the proxy as a cookie.
2012-04-03 10:17:47 -07:00