openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Provide compute nodes with domain information

Browse Source 
The domain is missing from the credentials that nova cloud
controller passes to the compute nodes. This change adds it in.

Closes-Bug: 1830536
Change-Id: I2ad82b9b271d83e1b49691187c620d7b976e5ff0
This commit is contained in:
Liam Young
2019-07-12 08:45:27 +00:00
parent a51efaf640
commit 77a79f4359
6 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -11,3 +11,4 @@ xenial/
tests/cirros-*-disk.img tests/cirros-*-disk.img
func*.json func*.json
.stestr .stestr
__pycache__

1
hooks/nova_cc_hooks.py
View File

@@ -487,6 +487,7 @@ def _auth_config():
'service_tenant': ncc_utils.auth_token_config('admin_tenant_name'), 'service_tenant': ncc_utils.auth_token_config('admin_tenant_name'),
# add api version if found # add api version if found
'api_version': ncc_utils.auth_token_config('api_version') or '2.0', 'api_version': ncc_utils.auth_token_config('api_version') or '2.0',
'admin_domain_name': ncc_utils.auth_token_config('admin_domain_name')
} }
return cfg return cfg

3
templates/icehouse/etc_nova_api-paste.ini
View File

@@ -124,4 +124,7 @@ auth_protocol = {{ auth_protocol }}
admin_tenant_name = {{ admin_tenant_name }} admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }} admin_user = {{ admin_user }}
admin_password = {{ admin_password }} admin_password = {{ admin_password }}
{% if admin_domain_name -%}
admin_domain_name = {{ admin_domain_name }}
{% endif -%}
{% endif -%} {% endif -%}

3
templates/kilo/etc_nova_api-paste.ini
View File

@@ -147,4 +147,7 @@ auth_protocol = {{ auth_protocol }}
admin_tenant_name = {{ admin_tenant_name }} admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }} admin_user = {{ admin_user }}
admin_password = {{ admin_password }} admin_password = {{ admin_password }}
{% if admin_domain_name -%}
admin_domain_name = {{ admin_domain_name }}
{% endif -%}
{% endif -%} {% endif -%}

3
templates/liberty/etc_nova_api-paste.ini
View File

@@ -148,4 +148,7 @@ admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }} admin_user = {{ admin_user }}
admin_password = {{ admin_password }} admin_password = {{ admin_password }}
api_version = {{ api_version }} api_version = {{ api_version }}
{% if admin_domain_name -%}
admin_domain_name = {{ admin_domain_name }}
{% endif -%}
{% endif -%} {% endif -%}

3
templates/mitaka/api-paste.ini
View File

@@ -116,4 +116,7 @@ auth_protocol = {{ auth_protocol }}
admin_tenant_name = {{ admin_tenant_name }} admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }} admin_user = {{ admin_user }}
admin_password = {{ admin_password }} admin_password = {{ admin_password }}
{% if admin_domain_name -%}
admin_domain_name = {{ admin_domain_name }}
{% endif -%}
{% endif -%} {% endif -%}