Commit 44e32cc4 by Michael DeHaan

Some formatting fixes so docs will build, etc.

parent 250bcaff
...@@ -49,6 +49,7 @@ def get_docstring(filename, verbose=False): ...@@ -49,6 +49,7 @@ def get_docstring(filename, verbose=False):
if 'EXAMPLES' in (t.id for t in child.targets): if 'EXAMPLES' in (t.id for t in child.targets):
plainexamples = child.value.s[1:] # Skip first empty line plainexamples = child.value.s[1:] # Skip first empty line
except: except:
traceback.print_exc() # temp
if verbose == True: if verbose == True:
traceback.print_exc() traceback.print_exc()
print "unable to parse %s" % filename print "unable to parse %s" % filename
......
...@@ -22,7 +22,7 @@ try: ...@@ -22,7 +22,7 @@ try:
from keystoneclient.v2_0 import client as ksclient from keystoneclient.v2_0 import client as ksclient
import time import time
except ImportError: except ImportError:
print("failed=True msg='glanceclient,novaclient and keystone client are required'") print "failed=True msg='glanceclient,novaclient and keystone client are required'"
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
...@@ -130,9 +130,7 @@ def _get_server_state(module, nova): ...@@ -130,9 +130,7 @@ def _get_server_state(module, nova):
return server_info, server return server_info, server
def _get_port_id(quantum, module, instance_id): def _get_port_id(quantum, module, instance_id):
kwargs = { kwargs = dict(device_id = instance_id)
device_id': instance_id,
}
try: try:
ports = quantum.list_ports(**kwargs) ports = quantum.list_ports(**kwargs)
except Exception as e: except Exception as e:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment