Merge "Use static environment for deployed-server neutron mappings"

deployed-server/deployed-server-environment-output.yaml

@@ -34,21 +34,11 @@ resources:
                 fixed_ips:
                   - ip_address: {get_param: [VipMap, redis]}
 
-  ResourceRegistry:
-    type: OS::Heat::Value
-    properties:
-      type: json
-      value:
-          OS::TripleO::DeployedServer::ControlPlanePort: tripleo-heat-templates/deployed-server/deployed-neutron-port.yaml
-          OS::TripleO::Network::Ports::ControlPlaneVipPort: tripleo-heat-templates/deployed-server/deployed-neutron-port.yaml
-
   DeployedServerEnvironment:
     type: OS::Heat::Value
     properties:
       type: json
       value:
-        resource_registry:
-          {get_attr: [ResourceRegistry, value]}
         parameter_defaults:
           map_merge:
             - {get_attr: [DeployedServerPortMapParameter, value]}

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

@@ -0,0 +1,4 @@
+resource_registry:
+  OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
+  OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/deployed-neutron-port.yaml
+