diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index fea59a2573..e7533d1741 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -139,13 +139,6 @@ parameters: default: '' description: A map of role name to a space separated list of IP addresses used to ping test each available network interface. type: json - StackAction: - type: string - description: > - Heat action on performed top-level stack. Note StackUpdateType is - set to UPGRADE when a major-version upgrade is in progress. - constraints: - - allowed_values: ['CREATE', 'UPDATE'] NetworkSafeDefaults: default: true description: Allow to enable/disable safe networking defaults if os-net-config would fail to run with the provided config. @@ -167,14 +160,6 @@ parameters: AnsibleHostVarsMap: type: json default: {} - StackUpdateType: - type: string - description: > - Type of update, to differentiate between UPGRADE and UPDATE cases - when StackAction is UPDATE (both are the same stack action). - constraints: - - allowed_values: ['', 'UPGRADE'] - default: '' ContainerCli: type: string default: 'podman' @@ -390,14 +375,12 @@ outputs: validate_fqdn: {get_param: ValidateFqdn} ping_test_gateway_ips: {get_param: PingTestGatewayIPsMap} ping_test_ips: {get_param: PingTestIpsMap} - stack_action: {get_param: StackAction} network_safe_defaults: {get_param: NetworkSafeDefaults} deploy_artifact_urls: {get_param: DeployArtifactURLs} deploy_artifact_files: {get_param: DeployArtifactFILEs} hosts_entry: {get_param: HostsEntry} primary_role_name: {{ primary_role_name }} deploy_identifier: {get_param: DeployIdentifier} - stack_update_type: {get_param: StackUpdateType} container_cli: {get_param: ContainerCli} enabled_services: {get_param: EnabledServices} control_virtual_ip: {get_param: ControlVirtualIP} @@ -616,7 +599,6 @@ outputs: name: tripleo_network_config vars: tripleo_network_config_script_path: "{{ NetworkConfig_stat.stat.path }}" - tripleo_network_config_action: "{{ stack_action }}" 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) }}" diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml index 0f5d9be568..aa370ce990 100644 --- a/deployment/ceph-ansible/ceph-base.yaml +++ b/deployment/ceph-ansible/ceph-base.yaml @@ -35,14 +35,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - StackUpdateType: - type: string - description: > - Type of update, to differentiate between UPGRADE and UPDATE cases - when StackAction is UPDATE (both are the same stack action). - constraints: - - allowed_values: ['', 'UPGRADE'] - default: '' NodeDataLookup: type: json default: {} @@ -390,8 +382,6 @@ conditions: yaql: data: {get_param: ContainerCephDaemonImage} expression: $.data.split('/')[0].matches('(\.|:)') - perform_upgrade: - equals: [{get_param: StackUpdateType}, 'UPGRADE'] ceph_ansible_skip_tags_set: not: equals: diff --git a/deployment/cephadm/ceph-base.yaml b/deployment/cephadm/ceph-base.yaml index 2746307a7e..de3e022673 100644 --- a/deployment/cephadm/ceph-base.yaml +++ b/deployment/cephadm/ceph-base.yaml @@ -30,14 +30,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - StackUpdateType: - type: string - description: > - Type of update, to differentiate between UPGRADE and UPDATE cases - when StackAction is UPDATE (both are the same stack action). - constraints: - - allowed_values: ['', 'UPGRADE'] - default: '' NodeDataLookup: type: json default: {} diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index e85c604f55..1b9b30cfd7 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml @@ -91,14 +91,6 @@ parameters: 'default' will use the underlying system OpenSSL defaults. constraints: - allowed_values: ['default', 'tlsv1_1', 'tlsv1_2', 'tlsv1_3'] - StackUpdateType: - type: string - description: > - Type of update, to differentiate between UPGRADE and UPDATE cases - when StackAction is UPDATE (both are the same stack action). - constraints: - - allowed_values: ['', 'UPGRADE'] - default: '' RootStackName: description: The name of the stack/plan. type: string @@ -124,9 +116,6 @@ conditions: equals: - {get_param: NovaVNCProxySSLCiphers} - '' - allow_noauth: - # Allow noauth VNC connections during P->Q upgrade. Remove in Rocky. - equals: [{get_param: StackUpdateType}, 'UPGRADE'] key_size_novavnc_override_set: not: {equals: [{get_param: NovaVNCCertificateKeySize}, '']} key_size_libvirtvnc_override_set: @@ -203,7 +192,6 @@ outputs: - if: - use_tls_for_vnc - nova::vncproxy::allow_vencrypt: true - nova::vncproxy::allow_noauth: {if: [allow_noauth, true, false]} nova::vncproxy::vencrypt_key: /etc/pki/tls/private/libvirt-vnc-client-cert.key nova::vncproxy::vencrypt_cert: /etc/pki/tls/certs/libvirt-vnc-client-cert.crt nova::vncproxy::vencrypt_ca: /etc/pki/CA/certs/vnc.crt diff --git a/releasenotes/notes/remove-stack-action-parameter-285044bb49ad1f5b.yaml b/releasenotes/notes/remove-stack-action-parameter-285044bb49ad1f5b.yaml new file mode 100644 index 0000000000..57ed60fea1 --- /dev/null +++ b/releasenotes/notes/remove-stack-action-parameter-285044bb49ad1f5b.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The StackAction/StackUpdateType parameters have been removed because they + have no significance with deployment using ephemeral heat.