Adds ability to deploy from upstream openstack

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

diff --git a/build/network-environment.yaml b/build/network-environment.yaml
index cb6e019..3fd22e3 100644 (file)
--- a/build/network-environment.yaml
+++ b/build/network-environment.yaml
@@ -59,15 +59,6 @@ resource_registry:
   OS::TripleO::Compute::Net::SoftwareConfig: nics/compute.yaml
   OS::TripleO::Controller::Net::SoftwareConfig: nics/controller.yaml
 
-  # 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
-
 parameter_defaults:
   NeutronExternalNetworkBridge: 'br-ex'
 
@@ -79,7 +70,7 @@ parameter_defaults:
     MongoDbNetwork: internal_api
     CinderApiNetwork: internal_api
     CinderIscsiNetwork: storage
-    GlanceApiNetwork: storage
+    GlanceApiNetwork: internal_api
     GlanceRegistryNetwork: internal_api
     KeystoneAdminApiNetwork: ctlplane
     KeystonePublicApiNetwork: internal_api