Remove and replace NetworkDeploymentActions

With Ephemeral Heat, we can no longer rely on the stack
action to perform tasks. Such as we did with
NetworkDeploymentActions. This change will add a new
parameter to replace this functionality.

Depends-On: https://review.opendev.org/c/openstack/tripleo-ansible/+/805213
Change-Id: I7067c31f4fcc3f263ae2e3ab993c8bff7113d55b
(cherry picked from commit 5edb21ee3e)
This commit is contained in:
Brendan Shephard 2021-08-19 13:23:00 +00:00 committed by James Slagle
parent 3584fe9b2b
commit e5d65dd215
5 changed files with 24 additions and 30 deletions

View File

@ -616,7 +616,7 @@ outputs:
vars: vars:
tripleo_network_config_script_path: "{{ NetworkConfig_stat.stat.path }}" tripleo_network_config_script_path: "{{ NetworkConfig_stat.stat.path }}"
tripleo_network_config_action: "{{ stack_action }}" tripleo_network_config_action: "{{ stack_action }}"
tripleo_network_config_network_deployment_actions: "{{ network_deployment_actions }}" tripleo_network_config_update: "{{ network_config_update }}"
tripleo_network_config_async_timeout: "{{ async_timeout | default(300) }}" tripleo_network_config_async_timeout: "{{ async_timeout | default(300) }}"
tripleo_network_config_async_poll: "{{ async_poll | default(3) }}" tripleo_network_config_async_poll: "{{ async_poll | default(3) }}"
tripleo_network_config_hide_sensitive_logs: false tripleo_network_config_hide_sensitive_logs: false

View File

@ -81,7 +81,7 @@ parameter_defaults:
TokenExpiration: 14400 TokenExpiration: 14400
EnablePackageInstall: true EnablePackageInstall: true
StackAction: CREATE StackAction: CREATE
NetworkDeploymentActions: ['CREATE','UPDATE'] UndercloudNetworkConfigUpdate: True
NeutronTunnelTypes: [] NeutronTunnelTypes: []
NeutronBridgeMappings: ctlplane:br-ctlplane NeutronBridgeMappings: ctlplane:br-ctlplane
NeutronAgentExtensions: [] NeutronAgentExtensions: []

View File

@ -347,10 +347,8 @@ parameter_defaults:
ContainerCli: podman ContainerCli: podman
EnablePackageInstall: false EnablePackageInstall: false
SoftwareConfigTransport: POLL_SERVER_HEAT SoftwareConfigTransport: POLL_SERVER_HEAT
NetworkDeploymentActions: ['CREATE']
{% for role in roles %} {% for role in roles %}
# Parameters generated for {{role.name}} Role # Parameters generated for {{role.name}} Role
{{role.name}}Services: {{role.ServicesDefault|default([])}} {{role.name}}Services: {{role.ServicesDefault|default([])}}
{{role.name}}NetworkDeploymentActions: []
{% endfor %} {% endfor %}

View File

@ -143,11 +143,6 @@ parameters:
Extra properties or metadata passed to Nova for the created nodes in Extra properties or metadata passed to Nova for the created nodes in
the overcloud. It's accessible via the Nova metadata API. the overcloud. It's accessible via the Nova metadata API.
type: json type: json
NetworkDeploymentActions:
type: comma_delimited_list
description: >
Heat action when to apply network configuration changes
default: ['CREATE']
# Compute-specific params # Compute-specific params
# FIXME(shardy) handle these deprecated names as they don't match compute.yaml # FIXME(shardy) handle these deprecated names as they don't match compute.yaml
HypervisorNeutronPhysicalBridge: HypervisorNeutronPhysicalBridge:
@ -240,11 +235,14 @@ parameters:
resource_registry) which represent nested stacks resource_registry) which represent nested stacks
for each service that should get installed on the {{role.name}} role. for each service that should get installed on the {{role.name}} role.
type: comma_delimited_list type: comma_delimited_list
{{role.name}}NetworkDeploymentActions: {{role.name}}NetworkConfigUpdate:
type: comma_delimited_list type: boolean
description: > description: >
Heat action when to apply network configuration changes When set to "True", existing networks will be updated on the overcloud.
default: [] This parameter replaces the functionality previously provided by
NetworkDeploymentActions. Defaults to "False" so that only new nodes will
have their networks configured. This is a role based parameter.
default: False
{{role.name}}AnyErrorsFatal: {{role.name}}AnyErrorsFatal:
default: yes default: yes
type: string type: string
@ -453,13 +451,6 @@ conditions:
- equals: - equals:
- get_param: [EndpointMapOverride, MysqlCellInternal] - get_param: [EndpointMapOverride, MysqlCellInternal]
- '' - ''
{%- for role in roles %}
{{role.name}}_network_deployment_actions_exists:
not:
equals:
- {get_param: {{role.name}}NetworkDeploymentActions}
- []
{%- endfor %}
set_default_nova_vnc_proxy_cell_public: set_default_nova_vnc_proxy_cell_public:
or: or:
- equals: - equals:
@ -656,15 +647,6 @@ resources:
type: json type: json
value: {get_attr: [{{role.name}}ServiceChain, role_data]} value: {get_attr: [{{role.name}}ServiceChain, role_data]}
{{role.name}}NetworkDeploymentActionsValue:
type: OS::Heat::Value
properties:
value:
if:
- {{role.name}}_network_deployment_actions_exists
- {get_param: {{role.name}}NetworkDeploymentActions}
- {get_param: NetworkDeploymentActions}
{{role.name}}ConfigData: {{role.name}}ConfigData:
type: OS::Heat::Value type: OS::Heat::Value
properties: properties:
@ -1310,7 +1292,7 @@ outputs:
max_fail_percentage: {get_param: {{role.name}}MaxFailPercentage} max_fail_percentage: {get_param: {{role.name}}MaxFailPercentage}
neutron_physical_bridge_name: {get_param: NeutronPhysicalBridge} neutron_physical_bridge_name: {get_param: NeutronPhysicalBridge}
neutron_public_interface_name: {get_param: NeutronPublicInterface} neutron_public_interface_name: {get_param: NeutronPublicInterface}
network_deployment_actions: {get_attr: [{{role.name}}NetworkDeploymentActionsValue, value]} network_config_update: {get_param: {{role.name}}NetworkConfigUpdate}
tripleo_network_config_os_net_config_mappings: {get_param: NetConfigDataLookup} tripleo_network_config_os_net_config_mappings: {get_param: NetConfigDataLookup}
deployed_server_port_map: {get_param: DeployedServerPortMap} deployed_server_port_map: {get_param: DeployedServerPortMap}
tripleo_network_config_override: {get_param: {{role.name}}NetConfigOverride} tripleo_network_config_override: {get_param: {{role.name}}NetConfigOverride}

View File

@ -0,0 +1,14 @@
---
features:
- |
Introduce new parameters {{role.name}}NetworkConfigUpdate.
This will be a bool. When {{role.name}}NetworkConfigUpdate is True
existing network configurations will be updated. By default, this
is False and only new deployments will have the networks configured.
This parameter is role based only, with no global option.
deprecations:
- |
This change removes NetworkDeploymentActions and
{{role.name}}NetworkDeploymentActions.
Since we can no longer rely on the Heat stack action when using
Ephemeral Heat in tripleo.