Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

auth_uri is deprecated from group keystone_authtoken #750

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

auth_uri is deprecated from group keystone_authtoken #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charmhelpers/contrib/openstack/audits/openstack_security_guide.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def validate_uses_tls_for_keystone(audit_options):
section = _config_section(audit_options, 'keystone_authtoken')
assert section is not None, "Missing section 'keystone_authtoken'"
assert not section.get('insecure') and \
"https://" in section.get("auth_uri"), \
"https://" in section.get("www_authenticate_uri"), \
"TLS is not used for Keystone"


Expand Down
2 changes: 1 addition & 1 deletion charmhelpers/contrib/openstack/templates/section-keystone-authtoken
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% if auth_host -%}
[keystone_authtoken]
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
www_authenticate_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
auth_plugin = password
project_domain_id = default
Expand Down
4 changes: 2 additions & 2 deletions charmhelpers/contrib/openstack/templates/section-keystone-authtoken-mitaka
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
[keystone_authtoken]
auth_type = password
{% if api_version == "3" -%}
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v3
www_authenticate_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v3
auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v3
project_domain_name = {{ admin_domain_name }}
user_domain_name = {{ admin_domain_name }}
{% if service_type -%}
service_type = {{ service_type }}
{% endif -%}
{% else -%}
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
www_authenticate_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
project_domain_name = default
user_domain_name = default
Expand Down
2 changes: 1 addition & 1 deletion tests/contrib/openstack/test_audits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ def test_validate_uses_keystone(self, _config_section):
'.openstack_security_guide._config_section')
def test_validate_uses_tls_for_keystone(self, _config_section):
_config_section.return_value = {
'auth_uri': 'https://10.10.10.10',
'www_authenticate_uri': 'https://10.10.10.10',
}
guide.validate_uses_tls_for_keystone({})
_config_section.assert_called_with({}, 'keystone_authtoken')
Expand Down