opendev/system-config
Code Issues Proposed changes

Merge "Adds insecure option to launch_node.py"

Browse Source
This commit is contained in:
Jenkins 2014-05-01 21:35:18 +00:00 committed by Gerrit Code Review
commit 5424d7aca7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launch/launch-node.py
View File

@ -33,6 +33,7 @@ NOVA_PASSWORD = os.environ['OS_PASSWORD']
NOVA_URL = os.environ['OS_AUTH_URL'] NOVA_URL = os.environ['OS_AUTH_URL']
NOVA_PROJECT_ID = os.environ['OS_TENANT_NAME'] NOVA_PROJECT_ID = os.environ['OS_TENANT_NAME']
NOVA_REGION_NAME = os.environ['OS_REGION_NAME'] NOVA_REGION_NAME = os.environ['OS_REGION_NAME']
NOVACLIENT_INSECURE = os.getenv('NOVACLIENT_INSECURE', None)
IPV6 = os.environ.get('IPV6', '0') is 1 IPV6 = os.environ.get('IPV6', '0') is 1
SCRIPT_DIR = os.path.dirname(sys.argv[0]) SCRIPT_DIR = os.path.dirname(sys.argv[0])
@ -46,6 +47,10 @@ def get_client():
kwargs = {} kwargs = {}
kwargs['region_name'] = NOVA_REGION_NAME kwargs['region_name'] = NOVA_REGION_NAME
kwargs['service_type'] = 'compute' kwargs['service_type'] = 'compute'
if NOVACLIENT_INSECURE:
kwargs['insecure'] = True
from novaclient.v1_1.client import Client from novaclient.v1_1.client import Client
client = Client(*args, **kwargs) client = Client(*args, **kwargs)
return client return client