Adds ability to deploy from upstream openstack

[apex.git] / build / opnfv-environment.yaml

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 9d04902..70243a5 100644 (file)
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -3,7 +3,6 @@
 # types
 
 parameters:
-  # value updated via lib/overcloud-deploy-functions.sh
   # CloudDomain:
 
 parameter_defaults:
@@ -181,3 +180,12 @@ parameter_defaults:
     - OS::TripleO::Services::NeutronHoneycombAgent
     - OS::TripleO::Services::NeutronVppAgent
     - OS::TripleO::Services::Vpp
+
+resource_registry:
+  # Services
+  OS::TripleO::Services::SwiftStorage: OS::Heat::None
+  OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
+  OS::TripleO::Services::SwiftProxy: OS::Heat::None
+  # Extra Config
+  OS::TripleO::ComputeExtraConfigPre: OS::Heat::None
+  OS::TripleO::ControllerExtraConfigPre: OS::Heat::None