Add OPNFV scenario environment

Add an OPNFV scenario environment that uses ODL for overcloud
networking and OVS for virthost networking.

Depends-On: I3d049d042c6346378afe7f62a18e491bbbb7f54b
Change-Id: If1f476bb933106456df3568978b4555dde190621
(cherry picked from commit f3f4e2856c)
This commit is contained in:
michaeltchapman 2017-07-25 16:22:22 +10:00 committed by Tim Rozet
parent 9b0ec2b73d
commit 86592d70ec
2 changed files with 62 additions and 7 deletions

View File

@ -0,0 +1,55 @@
resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerPostPuppetRestart: .OS::Heat::None
OS::TripleO::Services::OpenDaylightApi: ../../docker/services/opendaylight-api.yaml
OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-odl.yaml
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::Docker
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatApiCloudwatch
- OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::Keepalived
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::Memcached
- OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::NeutronDhcpAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronServer
- OS::TripleO::Services::NovaApi
- OS::TripleO::Services::NovaCompute
- OS::TripleO::Services::NovaConductor
- OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::NovaMetadata
- OS::TripleO::Services::NovaPlacement
- OS::TripleO::Services::NovaScheduler
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::OpenDaylightApi
- OS::TripleO::Services::OpenDaylightOvs
- OS::TripleO::Services::RabbitMQ
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::Timezone
- OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::TripleoFirewall
NeutronTypeDrivers: 'vlan,flat,vxlan'
Debug: true
DockerPuppetDebug: true
# we don't deploy Swift so we switch to file backend.
GlanceBackend: 'file'
KeystoneTokenProvider: 'fernet'
SwiftCeilometerPipelineEnabled: false
NeutronEnableForceMetadata: true
NeutronMechanismDrivers: 'opendaylight_v2'
NeutronServicePlugins: 'odl-router_v2,trunk'

View File

@ -84,6 +84,13 @@
- ^(docker|puppet)/services/.*tacker.*$
- ^environments\/.*.yaml
- ^deployed-server/.*$
- tripleo-ci-centos-7-scenario008-multinode-oooq-container:
files:
- ci/environments/scenario008-multinode-containers.yaml
- ^(docker|puppet)/services/.*(odl|opendaylight).*$
- ^(docker|puppet)/services/neutron-plugin-ml2.yaml #LP1765975
- ^environments\/.*.yaml
- ^deployed-server/.*$
gate:
queue: tripleo
jobs:
@ -164,13 +171,6 @@
- ci/environments/scenario005-multinode.yaml
- ci/pingtests/scenario005-multinode.yaml
- ^deployed-server/.*$
- tripleo-ci-centos-7-scenario008-multinode-oooq:
files:
- ^environments/.*opendaylight.*$
- ^puppet/services/.*opendaylight.*$
- ci/environments/scenario008-multinode.yaml
- ci/pingtests/scenario008-multinode.yaml
- ^deployed-server/.*$
- tripleo-ci-centos-7-scenario009-multinode-oooq:
files:
- ^coe/openshift.*$