From 809653e12641f731926d5b8a41b57f9efc580195 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 17 Jun 2019 12:03:58 +0200 Subject: [PATCH] devstack: add missing variables for ironic-python-agent-builder The ones for ironic-python-agent itself are defined in devstack. This changes adds similar variables for ironic-python-agent-builder and migrates the ironic-python-agent ones here to avoid confusion. Change-Id: Ic7eef9c8741ec2900401556f4053a4749b652d7c --- devstack/lib/ironic | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 61724952d6..c732931522 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -60,7 +60,13 @@ GITDIR["sushy-tools"]=$DEST/sushy-tools IRONIC_DIR=$DEST/ironic IRONIC_DEVSTACK_DIR=$IRONIC_DIR/devstack IRONIC_DEVSTACK_FILES_DIR=$IRONIC_DEVSTACK_DIR/files +# TODO(dtantsur): delete these three when we migrate image building to +# ironic-python-agent-builder completely +IRONIC_PYTHON_AGENT_REPO=${IRONIC_PYTHON_AGENT_REPO:-${GIT_BASE}/openstack/ironic-python-agent.git} +IRONIC_PYTHON_AGENT_BRANCH=${IRONIC_PYTHON_AGENT_BRANCH:-$TARGET_BRANCH} IRONIC_PYTHON_AGENT_DIR=$DEST/ironic-python-agent +IRONIC_PYTHON_AGENT_BUILDER_REPO=${IRONIC_PYTHON_AGENT_BUILDER_REPO:-${GIT_BASE}/openstack/ironic-python-agent-builder.git} +IRONIC_PYTHON_AGENT_BUILDER_BRANCH=${IRONIC_PYTHON_AGENT_BUILDER_BRANCH:-$TARGET_BRANCH} IRONIC_PYTHON_AGENT_BUILDER_DIR=$DEST/ironic-python-agent-builder IRONIC_DATA_DIR=$DATA_DIR/ironic IRONIC_STATE_PATH=/var/lib/ironic