zuul/nodepool
Code Issues Proposed changes

Merge "Write the cloud name into the provider info"

Browse Source
This commit is contained in:
Jenkins 2015-12-04 22:35:00 +00:00 committed by Gerrit Code Review
commit 2198eb2d59
2 changed files with 3 additions and 0 deletions
doc/source
scripts.rst
nodepool
nodepool.py

2
doc/source/scripts.rst

@ -66,6 +66,8 @@ Those files include:
**NODEPOOL_PROVIDER** **NODEPOOL_PROVIDER**
The name of the provider The name of the provider
**NODEPOOL_CLOUD**
The name of the cloud
**NODEPOOL_REGION** **NODEPOOL_REGION**
The name of the region The name of the region
**NODEPOOL_AZ** **NODEPOOL_AZ**

1
nodepool/nodepool.py

@ -623,6 +623,7 @@ class NodeLauncher(threading.Thread):
# Provider information for this node set # Provider information for this node set
f = ftp.open('/etc/nodepool/provider', 'w') f = ftp.open('/etc/nodepool/provider', 'w')
f.write('NODEPOOL_PROVIDER=%s\n' % self.provider.name) f.write('NODEPOOL_PROVIDER=%s\n' % self.provider.name)
f.write('NODEPOOL_CLOUD=%s\n' % self.provider.cloud_config.name)
f.write('NODEPOOL_REGION=%s\n' % ( f.write('NODEPOOL_REGION=%s\n' % (
self.provider.region_name or '',)) self.provider.region_name or '',))
f.write('NODEPOOL_AZ=%s\n' % (self.node.az or '',)) f.write('NODEPOOL_AZ=%s\n' % (self.node.az or '',))