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

Merge "Provide compute nodes with domain information"

This commit is contained in:
Zuul 2019-07-19 12:25:01 +00:00 committed by Gerrit Code Review
parent 31d1cfa83e 77a79f4359
commit ee35c1319d
6 changed files with 14 additions and 0 deletions
Show Stats 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
func*.json
.stestr
__pycache__

1
hooks/nova_cc_hooks.py
View File

@ -478,6 +478,7 @@ def _auth_config():
'service_tenant': ncc_utils.auth_token_config('admin_tenant_name'),
# add api version if found
'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

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_user = {{ admin_user }}
admin_password = {{ admin_password }}
{% if admin_domain_name -%}
admin_domain_name = {{ admin_domain_name }}
{% 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_user = {{ admin_user }}
admin_password = {{ admin_password }}
{% if admin_domain_name -%}
admin_domain_name = {{ admin_domain_name }}
{% 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_password = {{ admin_password }}
api_version = {{ api_version }}
{% if admin_domain_name -%}
admin_domain_name = {{ admin_domain_name }}
{% 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_user = {{ admin_user }}
admin_password = {{ admin_password }}
{% if admin_domain_name -%}
admin_domain_name = {{ admin_domain_name }}
{% endif -%}
{% endif -%}