Merge "Remove DeploymentSwiftDataMap parameter"

This commit is contained in:
Zuul 2019-07-30 21:08:49 +00:00 committed by Gerrit Code Review
commit fb420a32d3
4 changed files with 5 additions and 39 deletions

View File

@ -10,9 +10,6 @@ parameters:
DeployedServerPortMap:
type: json
default: {}
DeployedServerDeploymentSwiftDataMap:
type: json
default: {}
DefaultRouteIp:
type: string
default: 192.168.24.1
@ -42,7 +39,6 @@ resources:
parameter_defaults:
map_merge:
- {get_attr: [DeployedServerPortMapParameter, value]}
- DeploymentSwiftDataMap: {get_param: DeployedServerDeploymentSwiftDataMap}
- ControlPlaneDefaultRoute: {get_param: DefaultRouteIp}
- {get_param: RoleCounts}

View File

@ -53,9 +53,6 @@ parameters:
major-upgrade-composable-steps.yaml and major-upgrade-converge.yaml
environment files.
default: ''
deployment_swift_data:
type: json
default: {}
ControlPlaneSubnet:
default: ctlplane-subnet
description: The name of the undercloud Neutron control plane subnet
@ -67,7 +64,6 @@ resources:
properties:
name: {get_param: name}
software_config_transport: {get_param: software_config_transport}
deployment_swift_data: {get_param: deployment_swift_data}
ControlPlanePort:
type: OS::TripleO::DeployedServer::ControlPlanePort

View File

@ -185,25 +185,6 @@ parameters:
type: json
description: Parameters specific to the role
default: {}
DeploymentSwiftDataMap:
type: json
description: |
Map of servers to Swift container and object for storing deployment data.
The keys are the Heat assigned hostnames, and the value is a map of the
container/object name in Swift. Example value:
overcloud-controller-0:
container: overcloud-controller
object: 0
overcloud-controller-1:
container: overcloud-controller
object: 1
overcloud-controller-2:
container: overcloud-controller
object: 2
overcloud-novacompute-0:
container: overcloud-compute
object: 0
default: {}
{{role.name}}ControlPlaneSubnet:
default: ctlplane-subnet
description: |
@ -308,12 +289,6 @@ conditions:
equals:
- {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
- 1
deployment_swift_data_map_unset:
equals:
- get_param:
- DeploymentSwiftDataMap
- {get_param: Hostname}
- ""
{%- if role.deprecated_param_image is defined %}
deprecated_param_image_set:
not:
@ -431,12 +406,6 @@ resources:
- {get_param: {{role.name}}ServerMetadata}
- {get_param: ServiceMetadataSettings}
scheduler_hints: {get_param: {{role.name}}SchedulerHints}
deployment_swift_data:
if:
- deployment_swift_data_map_unset
- {}
- {get_param: [DeploymentSwiftDataMap,
{get_param: Hostname}]}
{%- for network in networks %}
{%- if network.enabled|default(true) and network.name in role.networks|default([]) %}

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Removed DeploymentSwiftDataMap parameter that has become
unusable with config-download workflow.