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 | |
| parent | 99746525887e20972970242ad05335f6f0830236 (diff) | |
| parent | 77f565e527fd2a7062d6cf0dfafec762d7feec4e (diff) | |
| download | kolla-2da0aa8ffc491d1bf5a0ebb3cd9468fe36df9e29.tar.gz kolla-2da0aa8ffc491d1bf5a0ebb3cd9468fe36df9e29.zip | |
Merge "Fix keytone options in all.yml/globals.yml"
| -rw-r--r-- | ansible/group_vars/all.yml | 6 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 25 |
2 files changed, 17 insertions, 14 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 diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 0edeb65c3..c401e5142 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -111,15 +111,6 @@ kolla_internal_vip_address: "10.10.10.254" # Valid options are [ novnc, spice ] #nova_console: "novnc" -# Valid options are [ uuid, fernet ] -#keystone_token_provider: 'uuid' -# Interval to rotate fernet keys by (in seconds). Must be an interval of -# 60(1 min), 120(2 min), 180(3 min), 240(4 min), 300(5 min), 360(6 min), -# 600(10 min), 720(12 min), 900(15 min), 1200(20 min), 1800(30 min), -# 3600(1 hour), 7200(2 hour), 10800(3 hour), 14400(4 hour), 21600(6 hour), -# 28800(8 hour), 43200(12 hour), 86400(1 day), 604800(1 week). -#fernet_token_expiry: 86400 - # OpenStack services can be enabled or disabled with these options #enable_ceilometer: "no" #enable_central_logging: "no" @@ -159,6 +150,22 @@ kolla_internal_vip_address: "10.10.10.254" # Valid options are [ erasure, replicated ] #ceph_pool_type: "replicated" + +####################### +# Keystone options +####################### + +# Valid options are [ uuid, fernet ] +#keystone_token_provider: 'uuid' + +# Interval to rotate fernet keys by (in seconds). Must be an interval of +# 60(1 min), 120(2 min), 180(3 min), 240(4 min), 300(5 min), 360(6 min), +# 600(10 min), 720(12 min), 900(15 min), 1200(20 min), 1800(30 min), +# 3600(1 hour), 7200(2 hour), 10800(3 hour), 14400(4 hour), 21600(6 hour), +# 28800(8 hour), 43200(12 hour), 86400(1 day), 604800(1 week). +#fernet_token_expiry: 86400 + + ####################### # Glance options ####################### |