opendev/system-config
Code Issues Proposed changes

Make third-party imports clearer in launch/.

Browse Source 
This is a minor step towards PEP-8 as well, but mainly makes it easier
to document what third party modules are needed.

Change-Id: Id901ef437fcdeb11c8dd555e8db7c13daa86c4b2
This commit is contained in:
Robert Collins 2013-08-30 16:08:41 +12:00
parent 5ae5e6cc5b
commit 49b0b0c78d
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launch/launch-node.py
View File

@ -26,10 +26,11 @@ import subprocess
import traceback import traceback
import socket import socket
import argparse import argparse
import utils
import dns
import shutil import shutil
import dns
import utils
NOVA_USERNAME=os.environ['OS_USERNAME'] NOVA_USERNAME=os.environ['OS_USERNAME']
NOVA_PASSWORD=os.environ['OS_PASSWORD'] NOVA_PASSWORD=os.environ['OS_PASSWORD']
NOVA_URL=os.environ['OS_AUTH_URL'] NOVA_URL=os.environ['OS_AUTH_URL']

3
launch/sshclient.py
View File

@ -18,9 +18,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import paramiko
import sys import sys
import paramiko
class SSHClient(object): class SSHClient(object):
def __init__(self, ip, username, password=None, pkey=None): def __init__(self, ip, username, password=None, pkey=None):
client = paramiko.SSHClient() client = paramiko.SSHClient()

11
launch/utils.py
View File

@ -18,20 +18,21 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import time
import os
import traceback
import socket
import novaclient import novaclient
from novaclient.v1_1 import client as Client11 from novaclient.v1_1 import client as Client11
try: try:
from v1_0 import client as Client10 from v1_0 import client as Client10
except: except:
pass pass
import time
import os
import traceback
import paramiko import paramiko
import socket
import salt.crypt import salt.crypt
from sshclient import SSHClient
from sshclient import SSHClient
def iterate_timeout(max_seconds, purpose): def iterate_timeout(max_seconds, purpose):
start = time.time() start = time.time()