Browse Source

Merge "Remove unused environment for split-stack"

changes/48/785648/1
Zuul 1 year ago committed by Gerrit Code Review
parent
commit
c01c377b38
  1. 53
      deployed-server/deployed-server-environment-output.yaml
  2. 1
      environments/overcloud-baremetal.j2.yaml
  3. 2
      environments/overcloud-services.yaml

53
deployed-server/deployed-server-environment-output.yaml

@ -1,53 +0,0 @@
heat_template_version: wallaby
parameters:
RoleCounts:
type: json
default: {}
VipMap:
type: json
default: {}
DeployedServerPortMap:
type: json
default: {}
DefaultRouteIp:
type: string
default: 192.168.24.1
resources:
DeployedServerPortMapParameter:
type: OS::Heat::Value
properties:
type: json
value:
DeployedServerPortMap:
map_merge:
- {get_param: DeployedServerPortMap}
- control_virtual_ip:
fixed_ips:
- ip_address: {get_param: [VipMap, ctlplane]}
- redis_virtual_ip:
fixed_ips:
- ip_address: {get_param: [VipMap, redis]}
- ovn_dbs_virtual_ip:
fixed_ips:
- ip_address: {get_param: [VipMap, ovn_dbs]}
DeployedServerEnvironment:
type: OS::Heat::Value
properties:
type: json
value:
parameter_defaults:
map_merge:
- {get_attr: [DeployedServerPortMapParameter, value]}
- ControlPlaneDefaultRoute: {get_param: DefaultRouteIp}
- {get_param: RoleCounts}
outputs:
deployed_server_environment:
description:
Environment data that can be used as input into the services stack when
using split-stack.
value: {get_attr: [DeployedServerEnvironment, value]}

1
environments/overcloud-baremetal.j2.yaml

@ -2,7 +2,6 @@ resource_registry:
OS::TripleO::AllNodes::SoftwareConfig: OS::Heat::None
OS::TripleO::PostDeploySteps: OS::Heat::None
OS::TripleO::AllNodesDeployment: OS::Heat::None
OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml
parameter_defaults:
# Deploy no services

2
environments/overcloud-services.yaml

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml
Loading…
Cancel
Save