openstack/kolla-ansible
Code Issues Proposed changes

Merge "Magnum: Enable cluster trust customization"

Browse Source
This commit is contained in:
Jenkins 2017-07-19 05:43:43 +00:00 committed by Gerrit Code Review
commit eab8efe166
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/magnum/defaults/main.yml
View File

@ -31,6 +31,12 @@ magnum_database_user: "magnum"
magnum_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}" magnum_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
####################
# Magnum
####################
enable_cluster_user_trust: False
#################### ####################
# Docker # Docker
#################### ####################

1
ansible/roles/magnum/templates/magnum.conf.j2
View File

@ -72,6 +72,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
trustee_domain_admin_password = {{ magnum_keystone_password }} trustee_domain_admin_password = {{ magnum_keystone_password }}
trustee_domain_admin_name = {{ magnum_trustee_domain_admin }} trustee_domain_admin_name = {{ magnum_trustee_domain_admin }}
trustee_domain_name = {{ magnum_trustee_domain }} trustee_domain_name = {{ magnum_trustee_domain }}
cluster_user_trust = {{ enable_cluster_user_trust }}
[oslo_concurrency] [oslo_concurrency]
lock_path = /var/lib/magnum/tmp lock_path = /var/lib/magnum/tmp