Merge "Minor fixes to re-align with Ironic"

This commit is contained in:
Zuul 2018-10-23 22:04:40 +00:00 committed by Gerrit Code Review
commit ff0dd4aeed
2 changed files with 9 additions and 5 deletions

View File

@ -57,7 +57,9 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=pxe_ipmitool"
# NOTE(TheJulia): Ironic switched to "hardware types" in Queens and
# removed legacy "drivers" in Rocky. "ipmi" superceeds *_ipmitool drivers.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=ipmi"
# NOTE(ykarel) Ironic to work with magnum, requires devstack to be configured with IP_VERSION=4
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IP_VERSION=4"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True"
@ -73,8 +75,9 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
# export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_ENABLE_TEMPURLS=True"
# export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_TEMPURL_KEY=password"
# export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_HASH=password"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS=fake,agent_ipmitool,pxe_ipmitool"
# NOTE(TheJulia): Enable interface order will result in the iscsi
# deployment method being used by default.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DEPLOY_INTERFACES=iscsi,direct"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"VOLUME_BACKING_FILE_SIZE=24G"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"FORCE_CONFIG_DRIVE=True"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"

View File

@ -38,10 +38,11 @@ function create_test_data {
elif [ "${coe}${special}" == 'k8s-ironic' ]; then
local bm_flavor_id=$(openstack flavor show baremetal -f value -c id)
die_if_not_set $LINENO bm_flavor_id "Failed to get id of baremetal flavor"
# NOTE(TheJulia): This issue was fixed in Feb 2018 as part of change
# Ifb9a49d4258a559cf2175d902e9424a3f98065c5. Commented out in Oct 2018.
# NOTE(yuanying): Workaround fix for ironic issue
# cf. https://bugs.launchpad.net/ironic/+bug/1596421
echo "alter table ironic.nodes modify instance_info LONGTEXT;" | mysql -uroot -p${MYSQL_PASSWORD} ironic
# echo "alter table ironic.nodes modify instance_info LONGTEXT;" | mysql -uroot -p${MYSQL_PASSWORD} ironic
# NOTE(yuanying): Ironic instances need to connect to Internet
openstack subnet set private-subnet --dns-nameserver 8.8.8.8
local container_format="ami"