1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
Index: git/setup.py
===================================================================
--- /dev/null
+++ git/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+
+setup(name='python-novnc',
+ version='2012.1~e3',
+ description='NoVNC python libraries',
+ author='Ghe Rivero',
+ author_email='ghe.rivero@stackops.com',
+ url='http://www.stackops.com',
+ packages = ['novnc'],
+ package_dir = {'novnc':'utils'},
+ py_modules=['wsproxy','websocket','web','json2graph','img2js'],
+)
Index: git/utils/__init__.py
===================================================================
--- /dev/null
+++ git/utils/__init__.py
@@ -0,0 +1 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
Index: git/utils/nova-novncproxy
===================================================================
--- git.orig/utils/nova-novncproxy
+++ git/utils/nova-novncproxy
@@ -27,7 +27,7 @@ from oslo.config import cfg
import socket
import sys
-import websockify
+from novnc import wsproxy
from nova import config
from nova import context
Index: git/utils/websockify
===================================================================
--- git.orig/utils/websockify
+++ git/utils/websockify
@@ -13,7 +13,7 @@ as taken from http://docs.python.org/dev
import signal, socket, optparse, time, os, sys, subprocess
from select import select
-import websocket
+from novnc import websocket
try:
from urllib.parse import parse_qs, urlparse
except:
|
