diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-08 07:09:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-08 07:09:37 +0000 |
| commit | 2da0aa8ffc491d1bf5a0ebb3cd9468fe36df9e29 (patch) | |
| tree | dd0b726099c263600f978c15924a057819770ac4 /ansible | |
| parent | 99746525887e20972970242ad05335f6f0830236 (diff) | |
| parent | 77f565e527fd2a7062d6cf0dfafec762d7feec4e (diff) | |
| download | kolla-2da0aa8ffc491d1bf5a0ebb3cd9468fe36df9e29.tar.gz kolla-2da0aa8ffc491d1bf5a0ebb3cd9468fe36df9e29.zip | |
Merge "Fix keytone options in all.yml/globals.yml"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/group_vars/all.yml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 3250293a7..64fc60b0e 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -297,16 +297,12 @@ kibana_user: "kibana" #################### -# Keystone Options +# Keystone options #################### keystone_admin_url: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}/v3" keystone_internal_url: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3" keystone_public_url: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ keystone_public_port }}/v3" - -##################################### -# Keystone - Identity Service options -##################################### keystone_token_provider: "uuid" fernet_token_expiry: 86400 |