j-griffith

diff --git a/nova/volume/san.py b/nova/volume/san.py
index 95627ff..4fba255 100644
--- a/nova/volume/san.py
+++ b/nova/volume/san.py
@@ -32,6 +32,7 @@ import string
 import uuid
 from xml.etree import ElementTree

+from nova import context
 from nova import exception

j-griffith

➜  mercado  diff san.py ~/Downloads/san.py
32d31
< import time
962c961
<
---
>         volume_list = self._get_volumes_by_sfaccount(sf_account['accountID'])
964,974c963,966
<         while iqn is None:
<             volume_list = self._get_volumes_by_sfaccount(sf_account['accountID'])

j-griffith

diff --git a/cinder/api/contrib/admin_actions.py b/cinder/api/contrib/admin_actions.py
index 4dbf736..65a55a6 100644
--- a/cinder/api/contrib/admin_actions.py
+++ b/cinder/api/contrib/admin_actions.py
@@ -43,6 +43,22 @@ class AdminController(wsgi.Controller):
         'error_deleting',
     ])

+    #TODO(jdg): Valid status items
+    valid_attach_status = set([

j-griffith

#!/bin/bash

ip_suffix=$1

X=( $(grep -r HWADDR /etc/sysconfig/network-scripts/ifcfg-*) )

for line in "${X[@]}"
do
  if [[ $line == *em1* ]]; then
    em1_hwaddr=$(echo $line | cut -f2 -d=)

j-griffith

https://gist.github.com/e1a175ecd6729b51ab71

j-griffith

diff --git a/cinder/api/contrib/admin_actions.py b/cinder/api/contrib/admin_actions.py
index 2766d35..5aa9bcb 100644
--- a/cinder/api/contrib/admin_actions.py
+++ b/cinder/api/contrib/admin_actions.py
@@ -33,13 +33,10 @@ class AdminController(wsgi.Controller):
 
     collection = None  # api collection to extend
 
-    # FIXME(clayg): this will be hard to keep up-to-date
-    # Concrete classes can expand or over-ride

j-griffith

--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -883,6 +883,42 @@ class FakeISCSIDriver(ISCSIDriver):
         LOG.debug(_("FAKE ISCSI: %s"), cmd)
         return (None, None)

+    def create_volume_from_snapshot(self, volume, snapshot):
+        """Creates a volume from a snapshot."""
+        pass
+

j-griffith

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 11603c7..9204aa7 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -2016,7 +2016,7 @@
 #auth_uri=<None>
 
 # Complete admin Identity API endpoint. This should specify
-# the unversioned root endpoint eg. https://localhost:35357/
+# the unversioned root endpoint e.g. https://localhost:35357/

j-griffith

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 11603c7..9204aa7 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -2016,7 +2016,7 @@
 #auth_uri=<None>
 
 # Complete admin Identity API endpoint. This should specify
-# the unversioned root endpoint eg. https://localhost:35357/
+# the unversioned root endpoint e.g. https://localhost:35357/

j-griffith

// Use Gists to store code you would like to remember later on
console.log(window); // log the "window" object to the console