opendev/system-config
Code Issues Proposed changes

Make OS_SERVICE_NAME optional in launch-node

Browse Source 
This parameter is usually not necessary, and over-specifying it
can be problematic because the value is not consistent.

Change-Id: I0a90631499294e7a6eb287f24739cf4884a8db7b
This commit is contained in:
James E. Blair
2015-09-16 10:08:02 -07:00
parent 413df4c67a
commit 7eab5a6f12
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
launch/launch-node.py
View File

@@ -32,7 +32,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']
NOVA_SERVICE_NAME = os.environ.get('OS_SERVICE_NAME', 'compute') NOVA_SERVICE_NAME = os.environ.get('OS_SERVICE_NAME')
NOVACLIENT_INSECURE = os.getenv('NOVACLIENT_INSECURE', None) NOVACLIENT_INSECURE = os.getenv('NOVACLIENT_INSECURE', None)
IPV6 = os.environ.get('IPV6', '0') is 1 IPV6 = os.environ.get('IPV6', '0') is 1
@@ -44,7 +44,8 @@ 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'
kwargs['service_name'] = NOVA_SERVICE_NAME if NOVA_SERVICE_NAME:
kwargs['service_name'] = NOVA_SERVICE_NAME
if NOVACLIENT_INSECURE: if NOVACLIENT_INSECURE:
kwargs['insecure'] = True kwargs['insecure'] = True