Use static environment for deployed-server neutron mappings

We can't include these mappings for the deployed-server neutron ports
when using split-stack in the generated environment file because the
path to the actual templates directory is not known from with the
templates themselves.

This patch removes the mappings from the generated environment from the
stack output and adds a static environment file with relative paths that
will have to be included on the deploy command cli instead.

Change-Id: Id4b8c939fa7b26205609819b66e76bf73c9890d0
Closes-Bug: #1705144

diff --git a/deployed-server/deployed-server-environment-output.yaml b/deployed-server/deployed-server-environment-output.yaml
index eaf7745..89c3886 100644 (file)
--- a/deployed-server/deployed-server-environment-output.yaml
+++ b/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]}

diff --git a/environments/deployed-server-deployed-neutron-ports.yaml b/environments/deployed-server-deployed-neutron-ports.yaml
new file mode 100644 (file)
index 0000000..1464f4b
--- /dev/null
+++ b/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
+