DirectXMan12

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

DirectXMan12

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

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
 

DirectXMan12

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

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

 STDOUT: ========================================================================#012====                        Guru Meditation                         ====#012========================================================================#012||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||#012#012#012========================================================================#012====                            Package                             ====#012========================================================================#012product = p#012version = vp#012vendor = v#012========================================================================#012====                            Threads                             ====#012========================================================================#012------                  Thread #140308865869632                   ------#012#012/usr/lib/python2.7/site-packages/eventlet/hubs/hub.py:236 in run#012    `self.wait(sleep_time)`#012#012/usr/lib/python2.7/

DirectXMan12

2014-03-11 15:48:14.494+0000: 13456: info : libvirt version: 1.1.3.3, package: 5.fc20 (Fedora Project, 2014-02-01-20:08:12, buildvm-17.phx2.fedoraproject.org)
2014-03-11 15:48:14.494+0000: 13456: debug : virObjectNew:199 : OBJECT_NEW: obj=0x7fc55c9a2b60 classname=virAccessManagerClass
2014-03-11 15:48:14.494+0000: 13456: debug : virAccessManagerNewDriver:105 : Initialized with stack
2014-03-11 15:48:14.494+0000: 13456: debug : virObjectNew:199 : OBJECT_NEW: obj=0x7fc55c996e90 classname=virAccessManagerClass
2014-03-11 15:48:14.494+0000: 13456: debug : virAccessManagerNewDriver:105 : Initialized with none
2014-03-11 15:48:14.494+0000: 13456: debug : virObjectRef:293 : OBJECT_REF: obj=0x7fc55c9a2b60
2014-03-11 15:48:14.494+0000: 13456: debug : virObjectUnref:256 : OBJECT_UNREF: obj=0x7fc55c9a2b60
2014-03-11 15:48:14.494+0000: 13456: debug : main:1295 : Decided on pid file path '/var/run/libvirtd.pid'
2014-03-11 15:48:14.494+0000: 13456: debug : main:1305 : Decided on socket paths '/var/run/libvirt/libvirt-sock'

DirectXMan12

2014-03-11 15:40:37.568+0000: 22628: info : libvirt version: 1.1.3.3, package: 5.fc20 (Fedora Project, 2014-02-01-20:08:12, buildvm-17.phx2.fedoraproject.org)
2014-03-11 15:40:37.568+0000: 22628: debug : virObjectNew:199 : OBJECT_NEW: obj=0x7fe38c82ab00 classname=virAccessManagerClass
2014-03-11 15:40:37.568+0000: 22628: debug : virAccessManagerNewDriver:105 : Initialized with stack
2014-03-11 15:40:37.568+0000: 22628: debug : virObjectNew:199 : OBJECT_NEW: obj=0x7fe38c81ee90 classname=virAccessManagerClass
2014-03-11 15:40:37.568+0000: 22628: debug : virAccessManagerNewDriver:105 : Initialized with none
2014-03-11 15:40:37.568+0000: 22628: debug : virObjectRef:293 : OBJECT_REF: obj=0x7fe38c82ab00
2014-03-11 15:40:37.568+0000: 22628: debug : virObjectUnref:256 : OBJECT_UNREF: obj=0x7fe38c82ab00
2014-03-11 15:40:37.568+0000: 22628: debug : main:1295 : Decided on pid file path '/var/run/libvirtd.pid'
2014-03-11 15:40:37.568+0000: 22628: debug : main:1305 : Decided on socket paths '/var/run/libvirt/libvirt-sock'

DirectXMan12

diff --git a/elements/puppet-stack-config/install.d/02-puppet-stack-config b/elements/puppet-stack-config/install.d/02-puppet-stack-config
index 8203b68..9b1a32a 100755
--- a/elements/puppet-stack-config/install.d/02-puppet-stack-config
+++ b/elements/puppet-stack-config/install.d/02-puppet-stack-config
@@ -52,6 +52,7 @@ context = {
     'UNDERCLOUD_IRONIC_PASSWORD': os.environ.get('UNDERCLOUD_IRONIC_PASSWORD', 'unset'),
     'UNDERCLOUD_TUSKAR_PASSWORD': os.environ.get('UNDERCLOUD_TUSKAR_PASSWORD', 'unset'),
     'UNDERCLOUD_DEBUG': os.environ.get('UNDERCLOUD_DEBUG', 'true'),
+    'ENABLE_LOG_AGGREGATION': os.environ.get('ENABLE_LOG_AGGREGATION', 'false'),
 

DirectXMan12

Keybase proof

I hereby claim:

• I am directxman12 on github.
• I am directxman12 (https://keybase.io/directxman12) on keybase.
• I have a public key whose fingerprint is C9FE C8DF 5A2B D298 9216 7120 BA68 333F 2CF8 73B6

To claim this, I am signing this object: