Skip to content

Instantly share code, notes, and snippets.

View DirectXMan12's full-sized avatar

Solly Ross DirectXMan12

View GitHub Profile
diff --git a/bin/swift-init b/bin/swift-init
index 3c992f7..c5c3e8c 100755
--- a/bin/swift-init
+++ b/bin/swift-init
@@ -17,6 +17,8 @@
import sys
from optparse import OptionParser
+from swift.openstack.common.report import guru_meditation_report as gmr
+
@DirectXMan12
DirectXMan12 / gist:9233369
Created February 26, 2014 16:46 — forked from anonymous/-
diff --git a/nova/cmd/novncproxy.py b/nova/cmd/novncproxy.py
index 6d30822..0ce9c47 100644
--- a/nova/cmd/novncproxy.py
+++ b/nova/cmd/novncproxy.py
@@ -24,11 +24,11 @@ import os
import sys
from oslo.config import cfg
+import websockify
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 9aa21a1..07cfdc8 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -3185,9 +3185,11 @@ class ComputeManager(manager.Manager):
block_device_info = self._get_instance_volume_block_device_info(
context, instance)
+ shared_storage = self._is_instance_storage_shared(context, instance)
+
@DirectXMan12
DirectXMan12 / gist:9080857
Created February 18, 2014 21:43
Updating Nova WebsocketProxy to use Websockify v0.6.0
diff --git a/nova/cmd/novncproxy.py b/nova/cmd/novncproxy.py
index 6d30822..0ce9c47 100644
--- a/nova/cmd/novncproxy.py
+++ b/nova/cmd/novncproxy.py
@@ -24,11 +24,11 @@ import os
import sys
from oslo.config import cfg
+import websockify
from nova import config
from nova.console import websocketproxy