Nic config mappings for deployed-server
authorJames Slagle <jslagle@redhat.com>
Mon, 6 Mar 2017 21:29:43 +0000 (16:29 -0500)
committerJames Slagle <jslagle@redhat.com>
Tue, 28 Mar 2017 11:45:11 +0000 (11:45 +0000)
commitc41f483676ce17a9a6b3421c7b0ecd1b4dc3b27c
tree706a4a7b92d303db999cdd62a697278489d1ef62
parentbb1b80ceb94e87bc3de3a3351acde52a980b4209
Nic config mappings for deployed-server

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
(cherry picked from commit cdbf1ca1918af649d1079ee07a9303059c9723ed)
environments/deployed-server-environment.j2.yaml [new file with mode: 0644]
environments/deployed-server-environment.yaml [deleted file]