Updating Apex to OpenStack Ocata

- power management updated to virtualbmc, pxe_ssh is deprecated
- removing custom tacker build
- removing custom congress build
- disabling yum update in undercloud on the cli instead of in a patch
- Undercloud is direct kernel booted now, there are no kernel and initrd
  in the disk image from upstream
- remove OpenDaylight previous to Carbon

JIRA: APEX-433
JIRA: APEX-432
JIRA: APEX-431

Change-Id: I6963f16e65eacade5607a3082b58b6150331406c
Signed-off-by: Dan Radez <dradez@redhat.com>

1 files changed, 21 insertions, 25 deletions

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 8eeb1265..6289e2d9 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -2,6 +2,7 @@
 #types
 
 parameters:
+  # value updated via lib/overcloud-deploy-functions.sh
   #CloudDomain:
 
 parameter_defaults:
@@ -9,17 +10,17 @@ parameter_defaults:
   NeutronEnableForceMetadata: true
   NeutronEnableDHCPMetadata: true
   NeutronEnableIsolatedMetadata: true
+  # the following parameters are given values via
+  # lib/overcloud-deploy-functions.sh when they are used by a scenario
   #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
+  #NovaSchedulerDefaultFilters:
+  #ComputeKernelArgs:
+  #PmdCoreList:
+  #OvsDpdkCoreList:
+  #OvsDpdkSocketMemory:
   #ControllerExtraConfig:
   #NovaComputeExtraConfig:
   ExtraConfig:
-    tripleo::ringbuilder::build_ring: False
     nova::nova_public_key:
       type: 'ssh-rsa'
       replace_public_key:
@@ -31,11 +32,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-fdio only.
+    # 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
@@ -44,7 +45,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
@@ -70,13 +70,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
@@ -107,19 +105,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::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
+#    - OS::TripleO::Services::Vpp
   ComputeServices:
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CephClient
@@ -140,10 +137,9 @@ parameter_defaults:
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::NeutronSriovAgent
     - OS::TripleO::Services::OpenDaylightOvs
-    - OS::TripleO::Services::ONOSOvs
+#    - 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::Vpp
+#    - OS::TripleO::Services::NeutronHoneycombAgent
+#    - OS::TripleO::Services::NeutronVppAgent
+#    - OS::TripleO::Services::Vpp