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>

1 files changed, 3 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index c0522f8..56a9d0a 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