From f88e06b52f4fcd7d2ce58b060e0aa0f41f8d77e3 Mon Sep 17 00:00:00 2001
From: Brandon Logan <brandon.logan@rackspace.com>
Date: Wed, 29 Jun 2016 16:51:34 -0500
Subject: [PATCH] Use correct code version for amphora agent image

Change-Id: I3d5ad4d4904cf5fdf19124ad4d66e6c9cf16a93c
Co-Authored-By: Adam Harwell <flux.adam@gmail.com>
---
 devstack/plugin.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index b5163bfe27..adb330789f 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -15,6 +15,9 @@ function octavia_install {
 
 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)
     die_if_not_set $LINENO TOKEN "Keystone failed to get token."