From b6c0341c8ca9cdaaf6767665a8a2528e21ebdaed Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Thu, 18 Aug 2016 09:12:55 -0700 Subject: [PATCH] Update code to use Pike as the code name Pike is the code name for the P release Queens is the code name for the Q release Update code to use Pike as the code name. No instances of 'Q' were found in the code. Change-Id: I02b312404b502ea7bf252cf89be7e99ef555c1b7 --- doc/source/drivers/oneview.rst | 4 ++-- ironic/common/policy.py | 2 +- ironic/drivers/modules/oneview/common.py | 2 +- .../add-dynamic-allocation-feature-2fd6b4df7943f178.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/source/drivers/oneview.rst b/doc/source/drivers/oneview.rst index 7f706df0ba..fbdcb5b8ef 100644 --- a/doc/source/drivers/oneview.rst +++ b/doc/source/drivers/oneview.rst @@ -44,7 +44,7 @@ OneView appliance. The Mitaka version of the ironic OneView drivers only supported what we call **pre-allocation** of nodes, meaning that resources in OneView are allocated prior to the node being made available in ironic. This model is deprecated and -will be supported until OpenStack's `P` release. From the Newton release on, +will be supported until OpenStack's Pike release. From the Newton release on, OneView drivers enables a new feature called **dynamic allocation** of nodes [6]_. In this model, the driver allocates resources in OneView only at boot time, allowing idle resources in ironic to be used by OneView users, enabling @@ -230,7 +230,7 @@ etc. In this case, to be enrolled, the node must have the following parameters: ``dynamic allocation`` for the given node. If this parameter is not set, the driver will consider the ``pre-allocation`` model to maintain compatibility on ironic upgrade. The support for this key will be dropped - in P, where only dynamic allocation will be used. + in the Pike release, where only dynamic allocation will be used. * In ``properties/capabilities`` diff --git a/ironic/common/policy.py b/ironic/common/policy.py index 237b78f859..9237d267a5 100644 --- a/ironic/common/policy.py +++ b/ironic/common/policy.py @@ -262,7 +262,7 @@ def enforce(rule, target, creds, do_raise=False, exc=None, *args, **kwargs): """ # NOTE(deva): this method is obsoleted by authorize(), but retained for # backwards compatibility in case it has been used downstream. - # It may be removed in the 'P' cycle. + # It may be removed in the Pike cycle. LOG.warning(_LW( "Deprecation warning: calls to ironic.common.policy.enforce() " "should be replaced with authorize(). This method may be removed " diff --git a/ironic/drivers/modules/oneview/common.py b/ironic/drivers/modules/oneview/common.py index 216ec952b9..20e0307ce1 100644 --- a/ironic/drivers/modules/oneview/common.py +++ b/ironic/drivers/modules/oneview/common.py @@ -207,7 +207,7 @@ def validate_oneview_resources_compatibility(task): oneview_client.validate_node_enclosure_group(oneview_info) oneview_client.validate_node_server_profile_template(oneview_info) - # NOTE(thiagop): Support to pre-allocation will be dropped in 'P' + # NOTE(thiagop): Support to pre-allocation will be dropped in the Pike # release if is_dynamic_allocation_enabled(task.node): oneview_client.is_node_port_mac_compatible_with_server_hardware( diff --git a/releasenotes/notes/add-dynamic-allocation-feature-2fd6b4df7943f178.yaml b/releasenotes/notes/add-dynamic-allocation-feature-2fd6b4df7943f178.yaml index ca5471a58f..46072a87dc 100644 --- a/releasenotes/notes/add-dynamic-allocation-feature-2fd6b4df7943f178.yaml +++ b/releasenotes/notes/add-dynamic-allocation-feature-2fd6b4df7943f178.yaml @@ -11,7 +11,7 @@ deprecations: - Deprecates pre-allocation feature for the OneView drivers since it requires resource allocation to Ironic prior to boot time, which makes Server Hardware unavailable to non-OpenStack OneView users. Pre-allocation will - be removed in the OpenStack "P" release. All nodes with + be removed in the OpenStack Pike release. All nodes with ``dynamic_allocation=False`` set, or that don't have the ``dynamic_allocation`` flag set, will be assumed to be in pre-allocation. Users may use the REST API or the ``ironic-oneview-cli`` to migrate nodes from pre-allocation to