Merge "Update code to use Pike as the code name"

This commit is contained in:
Jenkins 2016-08-19 17:28:44 +00:00 committed by Gerrit Code Review
commit 52853501c6
4 changed files with 5 additions and 5 deletions

View File

@ -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``

View File

@ -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 "

View File

@ -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(

View File

@ -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