openstack/ironic
Code Issues Proposed changes

Updates ironic for using ironic-python-agent-builder

Browse Source 
Change-Id: Ic7a515eeda59b6611049c39978fda3ccbb162a45
Task: 33746
Story: 2005114
This commit is contained in:
Nisha Brahmankar 2019-06-13 03:10:49 +05:30
parent a3b875ab23
commit df5ac6d5bc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/lib/ironic
View File

@ -61,6 +61,7 @@ IRONIC_DIR=$DEST/ironic
IRONIC_DEVSTACK_DIR=$IRONIC_DIR/devstack IRONIC_DEVSTACK_DIR=$IRONIC_DIR/devstack
IRONIC_DEVSTACK_FILES_DIR=$IRONIC_DEVSTACK_DIR/files IRONIC_DEVSTACK_FILES_DIR=$IRONIC_DEVSTACK_DIR/files
IRONIC_PYTHON_AGENT_DIR=$DEST/ironic-python-agent IRONIC_PYTHON_AGENT_DIR=$DEST/ironic-python-agent
IRONIC_PYTHON_AGENT_BUILDER_DIR=$DEST/ironic-python-agent-builder
IRONIC_DATA_DIR=$DATA_DIR/ironic IRONIC_DATA_DIR=$DATA_DIR/ironic
IRONIC_STATE_PATH=/var/lib/ironic IRONIC_STATE_PATH=/var/lib/ironic
IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic} IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic}
@ -2432,8 +2433,8 @@ function build_tinyipa_ramdisk {
local kernel_path=$1 local kernel_path=$1
local ramdisk_path=$2 local ramdisk_path=$2
local iso_path=$3 local iso_path=$3
git_clone $IRONIC_PYTHON_AGENT_REPO $IRONIC_PYTHON_AGENT_DIR $IRONIC_PYTHON_AGENT_BRANCH git_clone $IRONIC_PYTHON_AGENT_BUILDER_REPO $IRONIC_PYTHON_AGENT_BUILDER_DIR $IRONIC_PYTHON_AGENT_BUILDER_BRANCH
cd $IRONIC_PYTHON_AGENT_DIR/imagebuild/tinyipa cd $IRONIC_PYTHON_AGENT_BUILDER_DIR/tinyipa
export BUILD_AND_INSTALL_TINYIPA=true export BUILD_AND_INSTALL_TINYIPA=true
if is_ansible_deploy_enabled; then if is_ansible_deploy_enabled; then
export AUTHORIZE_SSH=true export AUTHORIZE_SSH=true
@ -2452,7 +2453,7 @@ function build_tinyipa_ramdisk {
function rebuild_tinyipa_for_ansible { function rebuild_tinyipa_for_ansible {
local ansible_tinyipa_ramdisk_name local ansible_tinyipa_ramdisk_name
pushd $IRONIC_PYTHON_AGENT_DIR/imagebuild/tinyipa pushd $IRONIC_PYTHON_AGENT_BUILDER_DIR/tinyipa
export TINYIPA_RAMDISK_FILE=$IRONIC_DEPLOY_RAMDISK export TINYIPA_RAMDISK_FILE=$IRONIC_DEPLOY_RAMDISK
export SSH_PUBLIC_KEY=$IRONIC_ANSIBLE_SSH_KEY.pub export SSH_PUBLIC_KEY=$IRONIC_ANSIBLE_SSH_KEY.pub
make addssh make addssh

1
zuul.d/ironic-jobs.yaml
View File

@ -7,6 +7,7 @@
required-projects: required-projects:
- openstack/ironic - openstack/ironic
- openstack/ironic-python-agent - openstack/ironic-python-agent
- openstack/ironic-python-agent-builder
- openstack/ironic-tempest-plugin - openstack/ironic-tempest-plugin
- x/pyghmi - x/pyghmi
- openstack/virtualbmc - openstack/virtualbmc