openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Nic config mappings for deployed-server"

This commit is contained in:
Jenkins 2017-03-28 09:26:31 +00:00 committed by Gerrit Code Review
parent 0e76a20cae cdbf1ca191
commit 835f2650c5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
environments/deployed-server-environment.j2.yaml Normal file
View File

@ -0,0 +1,11 @@
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

4
environments/deployed-server-environment.yaml
View File

@ -1,4 +0,0 @@
resource_registry:
OS::TripleO::Server: ../deployed-server/deployed-server.yaml
OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port
OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None