summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-23 22:04:40 +0000
committerGerrit Code Review <review@openstack.org>2018-10-23 22:04:40 +0000
commitff0dd4aeed651e6db1f38cd0453d1c1656f4fbea (patch)
tree8aa09ac41f815697d0e37b99e4778d5957a8affa
parent62a143c1c18be3d86d4b70275780f3a8c0971841 (diff)
parent547f9309a1e5b92dbbc44165d3c8a7ff6256adc6 (diff)
Merge "Minor fixes to re-align with Ironic"
-rwxr-xr-xmagnum/tests/contrib/gate_hook.sh9
-rwxr-xr-xmagnum/tests/contrib/post_test_hook.sh5
2 files changed, 9 insertions, 5 deletions
diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh
index 6a0c0ac..9fe5fba 100755
--- a/magnum/tests/contrib/gate_hook.sh
+++ b/magnum/tests/contrib/gate_hook.sh
@@ -57,7 +57,9 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
57 57
58 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" 58 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
59 59
60 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=pxe_ipmitool" 60 # NOTE(TheJulia): Ironic switched to "hardware types" in Queens and
61 # removed legacy "drivers" in Rocky. "ipmi" superceeds *_ipmitool drivers.
62 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=ipmi"
61 # NOTE(ykarel) Ironic to work with magnum, requires devstack to be configured with IP_VERSION=4 63 # NOTE(ykarel) Ironic to work with magnum, requires devstack to be configured with IP_VERSION=4
62 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IP_VERSION=4" 64 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IP_VERSION=4"
63 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True" 65 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True"
@@ -73,8 +75,9 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
73 # export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_ENABLE_TEMPURLS=True" 75 # export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_ENABLE_TEMPURLS=True"
74 # export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_TEMPURL_KEY=password" 76 # export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_TEMPURL_KEY=password"
75 # export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_HASH=password" 77 # export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_HASH=password"
76 78 # NOTE(TheJulia): Enable interface order will result in the iscsi
77 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS=fake,agent_ipmitool,pxe_ipmitool" 79 # deployment method being used by default.
80 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DEPLOY_INTERFACES=iscsi,direct"
78 export DEVSTACK_LOCAL_CONFIG+=$'\n'"VOLUME_BACKING_FILE_SIZE=24G" 81 export DEVSTACK_LOCAL_CONFIG+=$'\n'"VOLUME_BACKING_FILE_SIZE=24G"
79 export DEVSTACK_LOCAL_CONFIG+=$'\n'"FORCE_CONFIG_DRIVE=True" 82 export DEVSTACK_LOCAL_CONFIG+=$'\n'"FORCE_CONFIG_DRIVE=True"
80 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa" 83 export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
diff --git a/magnum/tests/contrib/post_test_hook.sh b/magnum/tests/contrib/post_test_hook.sh
index 7331a84..92b8888 100755
--- a/magnum/tests/contrib/post_test_hook.sh
+++ b/magnum/tests/contrib/post_test_hook.sh
@@ -38,10 +38,11 @@ function create_test_data {
38 elif [ "${coe}${special}" == 'k8s-ironic' ]; then 38 elif [ "${coe}${special}" == 'k8s-ironic' ]; then
39 local bm_flavor_id=$(openstack flavor show baremetal -f value -c id) 39 local bm_flavor_id=$(openstack flavor show baremetal -f value -c id)
40 die_if_not_set $LINENO bm_flavor_id "Failed to get id of baremetal flavor" 40 die_if_not_set $LINENO bm_flavor_id "Failed to get id of baremetal flavor"
41 41 # NOTE(TheJulia): This issue was fixed in Feb 2018 as part of change
42 # Ifb9a49d4258a559cf2175d902e9424a3f98065c5. Commented out in Oct 2018.
42 # NOTE(yuanying): Workaround fix for ironic issue 43 # NOTE(yuanying): Workaround fix for ironic issue
43 # cf. https://bugs.launchpad.net/ironic/+bug/1596421 44 # cf. https://bugs.launchpad.net/ironic/+bug/1596421
44 echo "alter table ironic.nodes modify instance_info LONGTEXT;" | mysql -uroot -p${MYSQL_PASSWORD} ironic 45 # echo "alter table ironic.nodes modify instance_info LONGTEXT;" | mysql -uroot -p${MYSQL_PASSWORD} ironic
45 # NOTE(yuanying): Ironic instances need to connect to Internet 46 # NOTE(yuanying): Ironic instances need to connect to Internet
46 openstack subnet set private-subnet --dns-nameserver 8.8.8.8 47 openstack subnet set private-subnet --dns-nameserver 8.8.8.8
47 local container_format="ami" 48 local container_format="ami"