diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2016-09-06 10:52:48 +0200 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2016-09-07 15:33:25 +0000 |
| commit | 77f565e527fd2a7062d6cf0dfafec762d7feec4e (patch) | |
| tree | 267afa7f1c4f333dd13511355d1fdec01b9ea0f0 /ansible | |
| parent | 5fca91c6fd45ff5807e1894598e6b97a00eef4bb (diff) | |
| download | kolla-77f565e527fd2a7062d6cf0dfafec762d7feec4e.tar.gz kolla-77f565e527fd2a7062d6cf0dfafec762d7feec4e.zip | |
Fix keytone options in all.yml/globals.yml
* merge keystone sections in all.yml
* move keystone parameters in globals.yml into its own section
TrivialFix
Change-Id: I72893a44dabd515243175098d5c4da3f8191597b
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 f14b86b4e..fcc38ef3d 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -291,16 +291,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 |