From 7b761f4148c170e32ac8621314c09aae4ea9165c Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 26 Feb 2015 16:30:13 -0500 Subject: [PATCH] Pass in service name to nova constructor. Because, you know, we should have to do this. Rackspace publishes two things called "compute" into their catalog for customers who still have the old compute service. Change-Id: I27d5a78fc743057a270acd4bf7c85fd998f9074d --- launch/launch-node.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/launch/launch-node.py b/launch/launch-node.py index adfb09b134..1601e8f617 100755 --- a/launch/launch-node.py +++ b/launch/launch-node.py @@ -32,6 +32,7 @@ NOVA_PASSWORD = os.environ['OS_PASSWORD'] NOVA_URL = os.environ['OS_AUTH_URL'] NOVA_PROJECT_ID = os.environ['OS_TENANT_NAME'] NOVA_REGION_NAME = os.environ['OS_REGION_NAME'] +NOVA_SERVICE_NAME = os.environ.get('OS_SERVICE_NAME', 'compute') NOVACLIENT_INSECURE = os.getenv('NOVACLIENT_INSECURE', None) IPV6 = os.environ.get('IPV6', '0') is 1 @@ -43,6 +44,7 @@ def get_client(): kwargs = {} kwargs['region_name'] = NOVA_REGION_NAME kwargs['service_type'] = 'compute' + kwargs['service_name'] = NOVA_SERVICE_NAME if NOVACLIENT_INSECURE: kwargs['insecure'] = True