From 8f62743c588eca54f52d944486917eb8d738355a Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Tue, 4 Aug 2015 15:18:03 +0100 Subject: [PATCH] Add deprecation messages on the bash ramdisk endpoints This patch is adding deprecation messages on the vendor passthru endpoints that are used by the bash ramdisk. Implements: blueprint deprecate-bash-ramdisk Change-Id: I271365952f1fc310992c564224af10d8b54cb7c4 --- ironic/drivers/modules/ilo/deploy.py | 8 ++++++++ ironic/drivers/modules/irmc/deploy.py | 9 +++++++++ ironic/drivers/modules/iscsi_deploy.py | 9 +++++++++ 3 files changed, 26 insertions(+) diff --git a/ironic/drivers/modules/ilo/deploy.py b/ironic/drivers/modules/ilo/deploy.py index 4e7c283466..746c77e716 100644 --- a/ironic/drivers/modules/ilo/deploy.py +++ b/ironic/drivers/modules/ilo/deploy.py @@ -871,6 +871,10 @@ class VendorPassthru(agent_base_vendor.BaseAgentVendor): 'error': The error message if status == 'FAILED' 'address': The IP address of the ramdisk """ + LOG.warning(_LW("The node %s is using the bash deploy ramdisk for " + "its deployment. This deploy ramdisk has been " + "deprecated. Please use the ironic-python-agent " + "(IPA) ramdisk instead."), task.node.uuid) task.process_event('resume') iscsi_deploy.validate_bootloader_install_status(task, kwargs) iscsi_deploy.finish_deploy(task, kwargs['address']) @@ -897,6 +901,10 @@ class VendorPassthru(agent_base_vendor.BaseAgentVendor): :raises: InvalidState """ node = task.node + LOG.warning(_LW("The node %s is using the bash deploy ramdisk for " + "its deployment. This deploy ramdisk has been " + "deprecated. Please use the ironic-python-agent " + "(IPA) ramdisk instead."), node.uuid) task.process_event('resume') iwdi = node.driver_internal_info.get('is_whole_disk_image') diff --git a/ironic/drivers/modules/irmc/deploy.py b/ironic/drivers/modules/irmc/deploy.py index 1ffcb1ee87..6b3149acb2 100644 --- a/ironic/drivers/modules/irmc/deploy.py +++ b/ironic/drivers/modules/irmc/deploy.py @@ -28,6 +28,7 @@ from ironic.common.glance_service import service_utils from ironic.common.i18n import _ from ironic.common.i18n import _LE from ironic.common.i18n import _LI +from ironic.common.i18n import _LW from ironic.common import images from ironic.common import states from ironic.common import utils @@ -794,6 +795,10 @@ class VendorPassthru(agent_base_vendor.BaseAgentVendor): 'error': The error message if status == 'FAILED' 'address': The IP address of the ramdisk """ + LOG.warning(_LW("The node %s is using the bash deploy ramdisk for " + "its deployment. This deploy ramdisk has been " + "deprecated. Please use the ironic-python-agent " + "(IPA) ramdisk instead."), task.node.uuid) task.process_event('resume') iscsi_deploy.validate_bootloader_install_status(task, kwargs) iscsi_deploy.finish_deploy(task, kwargs['address']) @@ -819,6 +824,10 @@ class VendorPassthru(agent_base_vendor.BaseAgentVendor): :raises: InvalidState """ node = task.node + LOG.warning(_LW("The node %s is using the bash deploy ramdisk for " + "its deployment. This deploy ramdisk has been " + "deprecated. Please use the ironic-python-agent " + "(IPA) ramdisk instead."), node.uuid) task.process_event('resume') LOG.debug('Continuing iSCSI virtual media deployment on node %s', diff --git a/ironic/drivers/modules/iscsi_deploy.py b/ironic/drivers/modules/iscsi_deploy.py index ee319a3819..2375754af9 100644 --- a/ironic/drivers/modules/iscsi_deploy.py +++ b/ironic/drivers/modules/iscsi_deploy.py @@ -27,6 +27,7 @@ from ironic.common.glance_service import service_utils as glance_service_utils from ironic.common.i18n import _ from ironic.common.i18n import _LE from ironic.common.i18n import _LI +from ironic.common.i18n import _LW from ironic.common import keystone from ironic.common import states from ironic.common import utils @@ -790,6 +791,10 @@ class VendorPassthru(agent_base_vendor.BaseAgentVendor): 'address': The IP address of the ramdisk """ + LOG.warning(_LW("The node %s is using the bash deploy ramdisk for " + "its deployment. This deploy ramdisk has been " + "deprecated. Please use the ironic-python-agent " + "(IPA) ramdisk instead."), task.node.uuid) task.process_event('resume') LOG.debug('Continuing the deployment on node %s', task.node.uuid) validate_bootloader_install_status(task, kwargs) @@ -808,6 +813,10 @@ class VendorPassthru(agent_base_vendor.BaseAgentVendor): :raises: InvalidState """ node = task.node + LOG.warning(_LW("The node %s is using the bash deploy ramdisk for " + "its deployment. This deploy ramdisk has been " + "deprecated. Please use the ironic-python-agent " + "(IPA) ramdisk instead."), node.uuid) task.process_event('resume') LOG.debug('Continuing the deployment on node %s', node.uuid)