From 77f565e527fd2a7062d6cf0dfafec762d7feec4e Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Tue, 6 Sep 2016 10:52:48 +0200
Subject: [PATCH] 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
---
 ansible/group_vars/all.yml |  6 +-----
 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 f14b86b4ef..fcc38ef3d3 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
 
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index a5a575de4e..a1fb5a802e 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"
@@ -158,6 +149,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
 #######################