From 257165e293068003d3e933718f6240790affdf4b Mon Sep 17 00:00:00 2001
From: Keith Holman <Keith.Holman@windriver.com>
Date: Mon, 12 May 2014 10:35:47 -0400
Subject: keystone: allow ability to store tokens in UUID or PKI format

Since Grizzly release Keystone defaults to storing tokens in PKI
format.  Some software works better with keystone if tokens
are in the older UUID format.  This change allows a simple way
to set the storage format within the bitbake receipes. The default
is to use the newer PKI format.

Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-keystone/keystone.conf | 2 +-
 meta-openstack/recipes-devtools/python/python-keystone_git.bb        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'meta-openstack/recipes-devtools')

diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf b/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf
index 3c3efb8..55bf6e8 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf
+++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone.conf
@@ -128,7 +128,7 @@ expiration = 3600
 #cert_required = True
 
 [signing]
-#token_format = PKI
+token_format = %TOKEN_FORMAT%
 #certfile = /etc/keystone/ssl/certs/signing_cert.pem
 #keyfile = /etc/keystone/ssl/private/signing_key.pem
 #ca_certs = /etc/keystone/ssl/certs/ca.pem
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index d8fb4ab..a1b4abc 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -23,6 +23,7 @@ S = "${WORKDIR}/git"
 inherit setuptools update-rc.d identity hosts default_configs
 
 SERVICE_TOKEN = "password"
+TOKEN_FORMAT ?= "PKI"
 
 do_install_append() {
 
@@ -46,6 +47,8 @@ do_install_append() {
     sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${KEYSTONE_CONF_DIR}/keystone.conf
     sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${KEYSTONE_CONF_DIR}/identity.sh
 
+    sed -e "s:%TOKEN_FORMAT%:${TOKEN_FORMAT}:g" -i ${KEYSTONE_CONF_DIR}/keystone.conf
+
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
         install -m 0755 ${WORKDIR}/keystone ${D}${sysconfdir}/init.d/keystone
-- 
cgit v1.2.3-54-g00ecf