Merge "Removing sdn_l3 and _l2 scenario features"

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

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 0018aa9..a861312 100644 (file)
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -1,23 +1,28 @@
-#Environment file used to list common parameters required for all deployment
-#types
+---
+# Environment file used to list common parameters required for all deployment
+# types
 
 parameters:
-  #CloudDomain:
+  # # value updated via lib/overcloud-deploy-functions.sh
+  # CloudDomain:
 
 parameter_defaults:
   CeilometerStoreEvents: true
   NeutronEnableForceMetadata: true
   NeutronEnableDHCPMetadata: true
   NeutronEnableIsolatedMetadata: true
-  #NeutronVPPAgentPhysnets: 'datacentre:GigabitEthernet2/2/0'
-  #NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
-  # Kernel arguments, this value will be set to kernel arguments specified for compute nodes in deploy setting file.
-  #ComputeKernelArgs: "intel_iommu=on iommu=pt default_hugepagesz=2MB hugepagesz=2MB hugepages=2048"
-  #PmdCoreList: 1
-  #OvsDpdkCoreList: 2
-  #OvsDpdkSocketMemory: 1024
+  # NeutronVPPAgentPhysnets:
+  # NovaSchedulerDefaultFilters:
+  # # Kernel arguments, this value will be set to kernel arguments specified
+  # # for compute nodes in deploy setting file.
+  # ComputeKernelArgs:
+  # PmdCoreList:
+  # OvsDpdkCoreList:
+  # OvsDpdkSocketMemory:
+  # ControllerExtraConfig:
+  # NovaComputeExtraConfig:
   ExtraConfig:
-    tripleo::ringbuilder::build_ring: False
+    tripleo::ringbuilder::build_ring: false
     nova::nova_public_key:
       type: 'ssh-rsa'
       replace_public_key:
@@ -29,11 +34,11 @@ parameter_defaults:
         key: 'os_compute_api:servers:show:host_status'
         value: 'rule:admin_or_owner'
     nova::api::default_floating_pool: 'external'
-    #VPP routing node, used for odl_l3-fdio only.
-    #opendaylight::vpp_routing_node: overcloud-novacompute-0.opnfvlf.org
+    # VPP routing node, used for odl-fdio only.
+    # value updated via lib/overcloud-deploy-functions.sh
+    # opendaylight::vpp_routing_node: overcloud-novacompute-0.opnfvlf.org
   ControllerServices:
     - OS::TripleO::Services::CACerts
-#    - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephMon
     - OS::TripleO::Services::CephOSD
     - OS::TripleO::Services::CephExternal
@@ -42,7 +47,6 @@ parameter_defaults:
     - OS::TripleO::Services::CinderBackup
     - OS::TripleO::Services::CinderScheduler
     - OS::TripleO::Services::CinderVolume
-    - OS::TripleO::Services::Core
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Keystone
     - OS::TripleO::Services::GlanceApi
@@ -68,13 +72,11 @@ parameter_defaults:
     - OS::TripleO::Services::MongoDb
     - OS::TripleO::Services::NovaApi
     - OS::TripleO::Services::NovaMetadata
+    - OS::TripleO::Services::NovaPlacement
     - OS::TripleO::Services::NovaScheduler
     - OS::TripleO::Services::NovaConsoleauth
     - OS::TripleO::Services::NovaVncProxy
     - OS::TripleO::Services::Ntp
-    - OS::TripleO::Services::SwiftProxy
-    - OS::TripleO::Services::SwiftStorage
-    - OS::TripleO::Services::SwiftRingBuilder
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::CeilometerApi
@@ -105,16 +107,18 @@ parameter_defaults:
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::OpenDaylightApi
     - OS::TripleO::Services::OpenDaylightOvs
+#    - OS::TripleO::Services::ONOSApi
+#    - OS::TripleO::Services::ONOSOvs
     - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::FluentdClient
-    - OS::TripleO::Services::VipHosts
     - OS::TripleO::Services::Etcd
-    - OS::TripleO::Services::Gluon
+#    - OS::TripleO::Services::Gluon
     - OS::TripleO::Services::Tacker
-    - OS::TripleO::Services::NeutronHoneycombAgent
+#    - OS::TripleO::Services::NeutronHoneycombAgent
     - OS::TripleO::Services::Congress
-    - OS::TripleO::Services::NeutronVppAgent
+#    - OS::TripleO::Services::NeutronVppAgent
     - OS::TripleO::Services::OVNDBs
+#    - OS::TripleO::Services::Vpp
   ComputeServices:
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CephClient
@@ -135,8 +139,9 @@ parameter_defaults:
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::NeutronSriovAgent
     - OS::TripleO::Services::OpenDaylightOvs
+#    - OS::TripleO::Services::ONOSOvs
     - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::FluentdClient
-    - OS::TripleO::Services::VipHosts
-    - OS::TripleO::Services::NeutronHoneycombAgent
-    - OS::TripleO::Services::NeutronVppAgent
+#    - OS::TripleO::Services::NeutronHoneycombAgent
+#    - OS::TripleO::Services::NeutronVppAgent
+#    - OS::TripleO::Services::Vpp