Browse Source

Merge "Minor fixes to re-align with Ironic"

tags/8.0.0.0rc1
Zuul 7 months ago
parent
commit
ff0dd4aeed
2 changed files with 9 additions and 5 deletions
  1. 6
    3
      magnum/tests/contrib/gate_hook.sh
  2. 3
    2
      magnum/tests/contrib/post_test_hook.sh

+ 6
- 3
magnum/tests/contrib/gate_hook.sh View File

@@ -57,7 +57,9 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
57 57
 
58 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 63
     # NOTE(ykarel) Ironic to work with magnum, requires devstack to be configured with IP_VERSION=4
62 64
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"IP_VERSION=4"
63 65
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BAREMETAL_BASIC_OPS=True"
@@ -73,8 +75,9 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
73 75
     # export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_ENABLE_TEMPURLS=True"
74 76
     # export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_TEMPURL_KEY=password"
75 77
     # export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_HASH=password"
76
-
77
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS=fake,agent_ipmitool,pxe_ipmitool"
78
+    # NOTE(TheJulia): Enable interface order will result in the iscsi
79
+    # deployment method being used by default.
80
+    export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DEPLOY_INTERFACES=iscsi,direct"
78 81
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"VOLUME_BACKING_FILE_SIZE=24G"
79 82
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"FORCE_CONFIG_DRIVE=True"
80 83
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"

+ 3
- 2
magnum/tests/contrib/post_test_hook.sh View File

@@ -38,10 +38,11 @@ function create_test_data {
38 38
     elif [ "${coe}${special}" == 'k8s-ironic' ]; then
39 39
         local bm_flavor_id=$(openstack flavor show baremetal -f value -c id)
40 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 43
         # NOTE(yuanying): Workaround fix for ironic issue
43 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 46
         # NOTE(yuanying): Ironic instances need to connect to Internet
46 47
         openstack subnet set private-subnet --dns-nameserver 8.8.8.8
47 48
         local container_format="ami"

Loading…
Cancel
Save