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
This commit is contained in:
parent
2a6f452a2c
commit
5edb21ee3e
@ -619,7 +619,7 @@ outputs:
|
||||
vars:
|
||||
tripleo_network_config_script_path: "{{ NetworkConfig_stat.stat.path }}"
|
||||
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_poll: "{{ async_poll | default(3) }}"
|
||||
tripleo_network_config_hide_sensitive_logs: false
|
||||
|
@ -81,7 +81,7 @@ parameter_defaults:
|
||||
TokenExpiration: 14400
|
||||
EnablePackageInstall: true
|
||||
StackAction: CREATE
|
||||
NetworkDeploymentActions: ['CREATE','UPDATE']
|
||||
UndercloudNetworkConfigUpdate: True
|
||||
NeutronTunnelTypes: []
|
||||
NeutronBridgeMappings: ctlplane:br-ctlplane
|
||||
NeutronAgentExtensions: []
|
||||
|
@ -364,12 +364,10 @@ parameter_defaults:
|
||||
ContainerCli: podman
|
||||
EnablePackageInstall: false
|
||||
SoftwareConfigTransport: POLL_SERVER_HEAT
|
||||
NetworkDeploymentActions: ['CREATE']
|
||||
|
||||
{% for role in roles %}
|
||||
# Parameters generated for {{role.name}} Role
|
||||
{{role.name}}Services: {{role.ServicesDefault|default([])}}
|
||||
{{role.name}}NetworkDeploymentActions: []
|
||||
{{role.name}}Parameters: {}
|
||||
{% endfor %}
|
||||
|
||||
|
@ -145,11 +145,6 @@ parameters:
|
||||
Extra properties or metadata passed to Nova for the created nodes in
|
||||
the overcloud. It's accessible via the Nova metadata API.
|
||||
type: json
|
||||
NetworkDeploymentActions:
|
||||
type: comma_delimited_list
|
||||
description: >
|
||||
Heat action when to apply network configuration changes
|
||||
default: ['CREATE']
|
||||
# Compute-specific params
|
||||
# FIXME(shardy) handle these deprecated names as they don't match compute.yaml
|
||||
HypervisorNeutronPhysicalBridge:
|
||||
@ -242,11 +237,14 @@ parameters:
|
||||
resource_registry) which represent nested stacks
|
||||
for each service that should get installed on the {{role.name}} role.
|
||||
type: comma_delimited_list
|
||||
{{role.name}}NetworkDeploymentActions:
|
||||
type: comma_delimited_list
|
||||
{{role.name}}NetworkConfigUpdate:
|
||||
type: boolean
|
||||
description: >
|
||||
Heat action when to apply network configuration changes
|
||||
default: []
|
||||
When set to "True", existing networks will be updated on the overcloud.
|
||||
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:
|
||||
default: yes
|
||||
type: string
|
||||
@ -455,13 +453,6 @@ conditions:
|
||||
- equals:
|
||||
- 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:
|
||||
or:
|
||||
- equals:
|
||||
@ -658,15 +649,6 @@ resources:
|
||||
type: json
|
||||
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:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
@ -1313,7 +1295,7 @@ outputs:
|
||||
max_fail_percentage: {get_param: {{role.name}}MaxFailPercentage}
|
||||
neutron_physical_bridge_name: {get_param: NeutronPhysicalBridge}
|
||||
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}
|
||||
deployed_server_port_map: {get_param: DeployedServerPortMap}
|
||||
tripleo_network_config_override: {get_param: {{role.name}}NetConfigOverride}
|
||||
|
14
releasenotes/notes/network-update-var-355dbbb4daee7f46.yaml
Normal file
14
releasenotes/notes/network-update-var-355dbbb4daee7f46.yaml
Normal 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.
|
Loading…
Reference in New Issue
Block a user