Use deployed server by default

This is the prep-work to drop the deployed-server-environment.yaml and
makes sure the deployed server is used by default.

Note that this change also makes the ControlPlanePort resource type
default to the deployed neutron port, because the port should be
pre-provisioned as part of baremetal node deployment process.

Change-Id: I03500eb2b4a6302f35aa71ae2f81bfd0c0bf064f

environments/deployed-network-environment.j2.yaml

@@ -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 %}

environments/deployed-server-deployed-neutron-ports.yaml

@@ -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

environments/deployed-server-environment.j2.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: {}

environments/deployed-server-noop-ctlplane.yaml

@@ -1,2 +1 @@
-resource_registry:
-  OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml
+resource_registry: {}

overcloud-resource-registry-puppet.j2.yaml

@@ -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 %}

overcloud.j2.yaml

@@ -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: |