openstack/octavia
Code Issues Proposed changes

Merge "Use correct code version for amphora agent image"

Browse Source
This commit is contained in:
Jenkins 2016-07-06 17:59:07 +00:00 committed by Gerrit Code Review
commit 86549d93c5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/plugin.sh
View File

@ -15,6 +15,9 @@ function octavia_install {
function build_octavia_worker_image { function build_octavia_worker_image {
# pull the agent code from the current code zuul has a reference to
export DIB_REPOLOCATION_amphora_agent=$OCTAVIA_DIR
export DIB_REPOREF_amphora_agent=$(git -C "$OCTAVIA_DIR" log -1 --pretty="format:%H")
TOKEN=$(openstack token issue | grep ' id ' | get_field 2) TOKEN=$(openstack token issue | grep ' id ' | get_field 2)
die_if_not_set $LINENO TOKEN "Keystone failed to get token." die_if_not_set $LINENO TOKEN "Keystone failed to get token."