From 8407c27366a45cacf931e0dec094dc2d7e56b2d1 Mon Sep 17 00:00:00 2001 From: Ruby Loo Date: Mon, 17 Oct 2016 16:02:58 -0400 Subject: [PATCH] Remove ..agent.build_instance_info_for_deploy() in Pike This is a followup to I0ce425325ad01455c72a96e013114509bbd74a66. Our deprecation/removal policy is to deprecate for at least 3 months and one cycle boundary, so we cannot delete build_instance_info_for_deploy() from ironic.drivers.modules.agent until Pike. This adds a release note about the deprecation. Change-Id: Ib4cf73a46c1a947bea65d6a54c77e955102b68f9 --- ironic/drivers/modules/agent.py | 6 +++--- .../notes/build_instance_info-c7e3f12426b48965.yaml | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/build_instance_info-c7e3f12426b48965.yaml diff --git a/ironic/drivers/modules/agent.py b/ironic/drivers/modules/agent.py index 77fa0506b4..8ef24050d5 100644 --- a/ironic/drivers/modules/agent.py +++ b/ironic/drivers/modules/agent.py @@ -68,11 +68,11 @@ PARTITION_IMAGE_LABELS = ('kernel', 'ramdisk', 'root_gb', 'root_mb', 'swap_mb', def build_instance_info_for_deploy(task): - # TODO(pas-ha) remove this at the end of Ocata release - LOG.warning(_LW("This function is moved to " + # TODO(pas-ha) remove this in Pike cycle + LOG.warning(_LW("This function has moved to " "'ironic.drivers.modules.deploy_utils' module. " "Using it from 'ironic.drivers.modules.agent' module " - "is deprecated and will be impossible in Ocata release. " + "is deprecated and will be removed in the Pike release. " "Please update your driver to use this function " "from its new location.")) return deploy_utils.build_instance_info_for_deploy(task) diff --git a/releasenotes/notes/build_instance_info-c7e3f12426b48965.yaml b/releasenotes/notes/build_instance_info-c7e3f12426b48965.yaml new file mode 100644 index 0000000000..5ebc185346 --- /dev/null +++ b/releasenotes/notes/build_instance_info-c7e3f12426b48965.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - The function build_instance_info_for_deploy() is deprecated from + ironic.drivers.modules.agent and will be removed in the Pike cycle. + Its new home is ironic.drivers.modules.deploy_utils. Out-of-tree + drivers that use this function should be updated accordingly.