Merge "Use deployed server by default"
This commit is contained in:
commit
6d8e3d94b0
|
@ -3,7 +3,6 @@
|
|||
|
||||
resource_registry:
|
||||
OS::TripleO::Network: ../network/deployed_networks.yaml
|
||||
OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml
|
||||
|
||||
# Role ports
|
||||
{%- for role in roles %}
|
||||
|
|
|
@ -7,4 +7,3 @@
|
|||
# ******************************************************************************
|
||||
resource_registry:
|
||||
OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
|
||||
OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml
|
||||
|
|
|
@ -1,7 +1 @@
|
|||
resource_registry:
|
||||
OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port
|
||||
|
||||
parameter_defaults:
|
||||
{% for role in roles %}
|
||||
{{role.name}}NetworkConfigTemplate: 'templates/net_config_static_bridge.j2'
|
||||
{% endfor %}
|
||||
parameter_defaults: {}
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
resource_registry:
|
||||
OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml
|
||||
resource_registry: {}
|
||||
|
|
|
@ -33,6 +33,7 @@ resource_registry:
|
|||
{%- endfor %}
|
||||
|
||||
OS::TripleO::Server: deployed-server/deployed-server.yaml
|
||||
OS::TripleO::DeployedServer::ControlPlanePort: deployed-server/deployed-neutron-port.yaml
|
||||
{% for role in roles %}
|
||||
OS::TripleO::{{role.name}}Server: OS::TripleO::Server
|
||||
{% endfor %}
|
||||
|
|
|
@ -213,11 +213,7 @@ parameters:
|
|||
{{role.name}}NetworkConfigTemplate:
|
||||
description: {{role.name}} NetworkConfig Template
|
||||
type: string
|
||||
{%- if 'external_bridge' in role.tags|default([]) %}
|
||||
default: 'templates/net_config_bridge.j2'
|
||||
{%- else %}
|
||||
default: ''
|
||||
{%- endif %}
|
||||
default: 'templates/net_config_static_bridge.j2'
|
||||
{{role.name}}ExtraConfig:
|
||||
default: {}
|
||||
description: |
|
||||
|
|
Loading…
Reference in New Issue