From dbb9913ecde02eeb6fa46f15cde15b9b06035533 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Wed, 1 Mar 2017 15:44:32 +0200 Subject: [PATCH] Do not use *_ssh ironic drivers by default SSH-based power and management driver interfaces and drivers that use them have been declared as unsupported in ironic before Newton release, and are aimed to be removed from ironic code in Pike release. This patch switches default for DEVSTACK_GATE_IRONIC_DRIVER to pxe_ipmitool, and removes *_ssh driver from default enabled drivers. Change-Id: I9b60c9fa24652e9e64e787cd4e5b0152f51e7a28 Depends-On: I74e26943862018b2beecc0b53ba1fb0183a6adf1 Related-Bug: #1570301 --- devstack-vm-gate-wrap.sh | 5 +++-- devstack-vm-gate.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 25a522c3..21c9764d 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -231,8 +231,9 @@ export DEVSTACK_GATE_NOVA_API_METADATA_SPLIT=${DEVSTACK_GATE_NOVA_API_METADATA_S # Set to 1 to run ironic baremetal provisioning service. export DEVSTACK_GATE_IRONIC=${DEVSTACK_GATE_IRONIC:-0} -# Set to "agent_ssh" to run ironic with the ironic-python-agent driver -export DEVSTACK_GATE_IRONIC_DRIVER=${DEVSTACK_GATE_IRONIC_DRIVER:-pxe_ssh} +# Set to "agent_ipmitool" to run ironic with the ironic-python-agent driver +export DEVSTACK_GATE_IRONIC_DRIVER=${DEVSTACK_GATE_IRONIC_DRIVER:-pxe_ipmitool} + # Set to 0 to avoid building Ironic deploy ramdisks export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=${DEVSTACK_GATE_IRONIC_BUILD_RAMDISK:-1} diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 38de526c..5b4efa2e 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -413,13 +413,13 @@ function setup_localrc { if [[ -z "${DEVSTACK_GATE_IRONIC_DRIVER%%agent*}" ]]; then localrc_set "$localrc_file" "SWIFT_ENABLE_TEMPURLS" "True" localrc_set "$localrc_file" "SWIFT_TEMPURL_KEY" "secretkey" - localrc_set "$localrc_file" "IRONIC_ENABLED_DRIVERS" "fake,agent_ssh,agent_ipmitool" + localrc_set "$localrc_file" "IRONIC_ENABLED_DRIVERS" "fake,agent_ipmitool" # agent driver doesn't support ephemeral volumes yet localrc_set "$localrc_file" "IRONIC_VM_EPHEMERAL_DISK" "0" # agent CoreOS ramdisk is a little heavy localrc_set "$localrc_file" "IRONIC_VM_SPECS_RAM" "1024" else - localrc_set "$localrc_file" "IRONIC_ENABLED_DRIVERS" "fake,pxe_ssh,pxe_ipmitool" + localrc_set "$localrc_file" "IRONIC_ENABLED_DRIVERS" "fake,pxe_ipmitool" localrc_set "$localrc_file" "IRONIC_VM_EPHEMERAL_DISK" "1" fi fi