zuul/nodepool
Code Issues Proposed changes

Merge "Add support for project-name parameter"

Browse Source
This commit is contained in:
Jenkins 2015-08-20 17:38:49 +00:00 committed by Gerrit Code Review
commit 778dbe442a
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -105,7 +105,7 @@ providers:
region-name: '$REGION_NAME' region-name: '$REGION_NAME'
service-type: 'compute' service-type: 'compute'
username: 'demo' username: 'demo'
project-id: 'demo' project-name: 'demo'
password: '$ADMIN_PASSWORD' password: '$ADMIN_PASSWORD'
auth-url: '$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION' auth-url: '$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION'
api-timeout: 60 api-timeout: 60

5
doc/source/configuration.rst
View File

@ -276,7 +276,7 @@ provider, the Nodepool image types are also defined (see
username: 'username' username: 'username'
password: 'password' password: 'password'
auth-url: 'http://auth.provider2.example.com/' auth-url: 'http://auth.provider2.example.com/'
project-id: 'project' project-name: 'project'
service-type: 'compute' service-type: 'compute'
service-name: 'compute' service-name: 'compute'
region-name: 'region1' region-name: 'region1'
@ -303,8 +303,9 @@ provider, the Nodepool image types are also defined (see
``password`` ``password``
``project-id`` ``project-id`` OR ``project-name``
Some clouds may refer to the ``project-id`` as ``tenant-id``. Some clouds may refer to the ``project-id`` as ``tenant-id``.
Some clouds may refer to the ``project-name`` as ``tenant-name``.
``auth-url`` ``auth-url``
Keystone URL. Keystone URL.

1
nodepool/cmd/config_validator.py
View File

@ -55,6 +55,7 @@ class ConfigValidator:
'password': str, 'password': str,
'auth-url': str, 'auth-url': str,
'project-id': str, 'project-id': str,
'project-name': str,
'max-servers': int, 'max-servers': int,
'pool': str, 'pool': str,
'image-type': str, 'image-type': str,

3
nodepool/nodepool.py
View File

@ -75,7 +75,8 @@ def _cloudKwargsFromProvider(provider):
cloud_kwargs['compute-service-name'] = provider['service-name'] cloud_kwargs['compute-service-name'] = provider['service-name']
auth_kwargs = {} auth_kwargs = {}
for auth_key in ('username', 'password', 'auth-url', 'project-id'): for auth_key in (
'username', 'password', 'auth-url', 'project-id', 'project-name'):
if auth_key in provider: if auth_key in provider:
auth_kwargs[auth_key] = provider[auth_key] auth_kwargs[auth_key] = provider[auth_key]

10
nodepool/tests/fixtures/config_validate/good.yaml vendored
View File

@ -428,7 +428,7 @@ providers:
service-name: 'Compute' service-name: 'Compute'
username: '<%= hpcloud_username %>' username: '<%= hpcloud_username %>'
password: '<%= hpcloud_password %>' password: '<%= hpcloud_password %>'
project-id: '<%= hpcloud_project %>' project-name: '<%= hpcloud_project %>'
auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0' auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
boot-timeout: 120 boot-timeout: 120
max-servers: 0 max-servers: 0
@ -531,7 +531,7 @@ providers:
service-name: 'Compute' service-name: 'Compute'
username: '<%= hpcloud_username %>' username: '<%= hpcloud_username %>'
password: '<%= hpcloud_password %>' password: '<%= hpcloud_password %>'
project-id: '<%= hpcloud_project %>' project-name: '<%= hpcloud_project %>'
auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0' auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
api-timeout: 60 api-timeout: 60
boot-timeout: 120 boot-timeout: 120
@ -620,7 +620,7 @@ providers:
service-name: 'Compute' service-name: 'Compute'
username: '<%= hpcloud_username %>' username: '<%= hpcloud_username %>'
password: '<%= hpcloud_password %>' password: '<%= hpcloud_password %>'
project-id: '<%= hpcloud_project %>' project-name: '<%= hpcloud_project %>'
auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0' auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
api-timeout: 60 api-timeout: 60
boot-timeout: 120 boot-timeout: 120
@ -709,7 +709,7 @@ providers:
service-name: 'Compute' service-name: 'Compute'
username: '<%= hpcloud_username %>' username: '<%= hpcloud_username %>'
password: '<%= hpcloud_password %>' password: '<%= hpcloud_password %>'
project-id: '<%= hpcloud_project %>' project-name: '<%= hpcloud_project %>'
auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0' auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
api-timeout: 60 api-timeout: 60
boot-timeout: 120 boot-timeout: 120
@ -799,7 +799,7 @@ providers:
service-name: 'Compute' service-name: 'Compute'
username: '<%= hpcloud_username %>' username: '<%= hpcloud_username %>'
password: '<%= hpcloud_password %>' password: '<%= hpcloud_password %>'
project-id: '<%= hpcloud_project %>' project-name: '<%= hpcloud_project %>'
auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0' auth-url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0'
api-timeout: 60 api-timeout: 60
boot-timeout: 120 boot-timeout: 120