Browse Source

Merge "Change deployed server environment for ansible nic config"

changes/94/755694/4
Zuul 11 months ago
committed by Gerrit Code Review
parent
commit
698d360cd0
  1. 12
      deployed-server/README.rst
  2. 7
      environments/deployed-server-environment.j2.yaml

12
deployed-server/README.rst

@ -45,13 +45,15 @@ that all connectivity is not lost in case of a configuration error. Be sure to
use correct nic config templates as needed, since the nodes will not receive
dhcp from the undercloud neutron-dhcp-agent service.
For example, the net-config-static-bridge.yaml template could be used for
controllers, and the net-config-static.yaml template could be used for computes
For example, the net_config_static_bridge.j2 template could be used for
controllers, and the net_config_static.j2 template could be used for computes
by specifying:
resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: /home/stack/deployed-server/tripleo-heat-templates/net-config-static-bridge.yaml
OS::TripleO::Compute::Net::SoftwareConfig: /home/stack/deployed-server/tripleo-heat-templates/net-config-static.yaml
parameter_defaults:
ControllerNetworkConfigWithAnsible: true
ComputeNetworkConfigWithAnsible: true
ControlleNetworkConfigTemplate: 'templates/net_config_static_bridge.j2'
ComputeNetworkConfigTemplate: 'templates/net_config_static.j2'
In a setup where the first nic on the servers is used for external management,
set the nic's to be used for OpenStack to nic2:

7
environments/deployed-server-environment.j2.yaml

@ -4,9 +4,12 @@ resource_registry:
OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None
{% for role in roles %}
# Default nic config mappings
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../net-config-static-bridge.yaml
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
{% endfor %}
parameter_defaults:
EnablePackageInstall: True
{% for role in roles %}
{{role.name}}NetworkConfigTemplate: 'templates/net_config_static_bridge.j2'
{{role.name}}NetworkConfigWithAnsible: true
{% endfor %}
Loading…
Cancel
Save