Merge "Parallelize docker-puppet.py"

[apex-tripleo-heat-templates.git] / environments / deployed-server-environment.yaml

diff --git a/environments/deployed-server-environment.yaml b/environments/deployed-server-environment.yaml
index e9004bd..7bc1bd9 100644 (file)
--- a/environments/deployed-server-environment.yaml
+++ b/environments/deployed-server-environment.yaml
@@ -1,3 +1,4 @@
 resource_registry:
   OS::TripleO::Server: ../deployed-server/deployed-server.yaml
-  OS::TripleO::DeployedServer::ControlPlanePort: ../deployed-server/ctlplane-port.yaml
+  OS::TripleO::DeployedServer::ControlPlanePort: OS::Neutron::Port
+  OS::TripleO::DeployedServer::Bootstrap: OS::Heat::None