summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri Mazmanov <dimitri.mazmanov@ericsson.com>2017-03-28 08:24:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-28 08:24:52 +0000
commit8e1c3b912289ce6d7af51a52a90b05b8a95f82bb (patch)
treeefb00dda9a2dbe4edf7a3fcd503e20296b220f4d
parent8b4eeb538124f5eedd932caa55bd72fcd6189e81 (diff)
parentb7b44bb73287c825a81a079136de6d0c9413ffdb (diff)
Merge "Use the latest Kingbird release"
-rwxr-xr-xtools/kingbird/install_kingbird.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/kingbird/install_kingbird.sh b/tools/kingbird/install_kingbird.sh
index 7ee5bad..693ca51 100755
--- a/tools/kingbird/install_kingbird.sh
+++ b/tools/kingbird/install_kingbird.sh
@@ -137,7 +137,7 @@ rm -rf kingbird/
#Setup Kingbird
git clone https://github.com/openstack/kingbird.git && cd kingbird/
-git checkout tags/0.2.1 -b colorado
+git checkout tags/1.1.0 -b colorado
pip install -r requirements.txt
pip install --force-reinstall -U .
@@ -165,6 +165,8 @@ iniset ${KINGBIRD_CONF_FILE} keystone_authtoken admin_user ${admin_user}
iniset ${KINGBIRD_CONF_FILE} keystone_authtoken admin_password ${admin_password}
iniset ${KINGBIRD_CONF_FILE} keystone_authtoken auth_uri ${auth_uri}
iniset ${KINGBIRD_CONF_FILE} keystone_authtoken identity_uri ${OS_AUTH_URL}
+iniset ${KINGBIRD_CONF_FILE} keystone_authtoken project_domain_name ${OS_PROJECT_DOMAIN_NAME}
+iniset ${KINGBIRD_CONF_FILE} keystone_authtoken user_domain_name ${OS_USER_DOMAIN_NAME}
# Configure the database.
iniset ${KINGBIRD_CONF_FILE} database connection "mysql://$mysql_user:$mysql_pass@$mysql_host/$mysql_db?charset=utf8"