openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Change deployed server environment for ansible nic config"

This commit is contained in:
Zuul 2020-10-20 00:26:28 +00:00 committed by Gerrit Code Review
parent c926343296 a81ce0b931
commit 698d360cd0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployed-server/README.rst
View File

@ -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 use correct nic config templates as needed, since the nodes will not receive
dhcp from the undercloud neutron-dhcp-agent service. dhcp from the undercloud neutron-dhcp-agent service.
For example, the net-config-static-bridge.yaml template could be used for For example, the net_config_static_bridge.j2 template could be used for
controllers, and the net-config-static.yaml template could be used for computes controllers, and the net_config_static.j2 template could be used for computes
by specifying: by specifying:
resource_registry: parameter_defaults:
OS::TripleO::Controller::Net::SoftwareConfig: /home/stack/deployed-server/tripleo-heat-templates/net-config-static-bridge.yaml ControllerNetworkConfigWithAnsible: true
OS::TripleO::Compute::Net::SoftwareConfig: /home/stack/deployed-server/tripleo-heat-templates/net-config-static.yaml 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, 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: set the nic's to be used for OpenStack to nic2:

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

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