diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-05 09:10:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-05 09:10:42 +0000 |
| commit | 9f408dbe8bc8371424ecb816877b1cfe62498f8d (patch) | |
| tree | 321e63097c6775eec585311eac13ca1064b7a4e3 /ci/environments | |
| parent | 9f5a01447bf45fff2f34a255c9cf64957620dd60 (diff) | |
| parent | c791d80a5c14e5507c425ab50e65dfda1d890410 (diff) | |
Merge "Remove bgp-vpn from scenario004-multinode-containers" into stable/pike
Diffstat (limited to 'ci/environments')
| -rw-r--r-- | ci/environments/scenario004-multinode-containers.yaml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index 3297fbf5..e2be75cc 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/ci/environments/scenario004-multinode-containers.yaml @@ -18,8 +18,6 @@ resource_registry: OS::TripleO::Services::ManilaScheduler: ../../docker/services/manila-scheduler.yaml OS::TripleO::Services::ManilaShare: ../../docker/services/pacemaker/manila-share.yaml OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml - # TODO: containerize NeutronBgpVpnApi - OS::TripleO::Services::NeutronBgpVpnApi: ../../puppet/services/neutron-bgpvpn-api.yaml # NOTE: This is needed because of upgrades from Ocata to Pike. We # deploy the initial environment with Ocata templates, and # overcloud-resource-registry.yaml there doesn't have this Docker @@ -49,7 +47,6 @@ parameter_defaults: - OS::TripleO::Services::HeatEngine - OS::TripleO::Services::MySQL - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronBgpVpnApi - OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronMetadataAgent @@ -80,6 +77,9 @@ parameter_defaults: - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::Sshd - OS::TripleO::Services::Iscsid + # TODO: in Queens, re-add bgp-vpn and l2gw services when + # containerized. + # https://bugs.launchpad.net/bugs/1713612 ControllerExtraConfig: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu @@ -98,6 +98,4 @@ parameter_defaults: CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' CephPoolDefaultSize: 1 SwiftCeilometerPipelineEnabled: false - NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin' - BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default' NotificationDriver: 'noop' |