openstack
/
kolla
Code Issues Proposed changes

Merge "Fix keytone options in all.yml/globals.yml"

This commit is contained in:
Jenkins 2016-09-08 07:09:37 +00:00 committed by Gerrit Code Review
parent 9974652588 77f565e527
commit 2da0aa8ffc
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/group_vars/all.yml
View File

@ -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

25
etc/kolla/globals.yml
View File

@ -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
#######################