no default nic config mappings when using deployed-server custom roles

[James Slagle]

When using the custom roles data for deployed-server's at deployed-server/deployed-server-roles-data.yaml, there is no default nic config mappings.

The jinja loop in overcloud-resource-registry-puppet.j2.yaml will generate noop mappings for each of the custom roles. It also adds a mapping for the Controller nic config to net-config-bridge.yaml. However, when using the deployed-server roles data, there is no role named controller.

We need to add some sensible defaults for the custom roles. Since L2 connectivity is not a requirement between undercloud/overclodu when using deployed-server, the nic configs should use static IP configurations and not dhcp.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/442170

[James Slagle (james-slagle)]

https://review.openstack.org/#/c/442170/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/442170
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=cdbf1ca1918af649d1079ee07a9303059c9723ed
Submitter: Jenkins
Branch: master

commit cdbf1ca1918af649d1079ee07a9303059c9723ed
Author: James Slagle <email address hidden>
Date: Mon Mar 6 16:29:43 2017 -0500

    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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/450734

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/450734
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=c41f483676ce17a9a6b3421c7b0ecd1b4dc3b27c
Submitter: Jenkins
Branch: stable/ocata

commit c41f483676ce17a9a6b3421c7b0ecd1b4dc3b27c
Author: James Slagle <email address hidden>
Date: Mon Mar 6 16:29:43 2017 -0500

    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)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 7.0.0.0b1 development milestone.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 6.1.0 release.