cdbf1ca191
Adds default nic config mappings when using the deployed-server custom roles data at deployed-server/deployed-server-roles-data.yaml. Previously there were no default mappings as the hardcoded mapping for the Controller role from overcloud-resource-registry-puppet.j2.yaml would not be used since there is no Controller role when using deployed-server. The default mapping is net-config-static.yaml instead of net-config-noop.yaml, since there is no requirement of a L2 domain for dhcp between undercloud and overcloud nodes when using deployed-server. The convenience mapping of ControllerDeployedServer to net-config-static-bridge.yaml is also added so that out of the box the roles with controller services will get the right bridge created. The mappings can always be overridden in later environment files if needed. Change-Id: I581fec99b459a12512686e47b10b962756652eb3 Closes-Bug: #1670493 Depends-On: Ib681729cc2728ca4b0486c14166b6b702edfcaab
12 lines
449 B
YAML
12 lines
449 B
YAML
resource_registry:
|
|
OS::TripleO::Server: ../deployed-server/deployed-server.yaml
|
|
OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port
|
|
OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None
|
|
|
|
{% for role in roles %}
|
|
# Default nic config mappings
|
|
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../net-config-static.yaml
|
|
{% endfor %}
|
|
|
|
OS::TripleO::ControllerDeployedServer::Net::SoftwareConfig: ../net-config-static-bridge.yaml
|