From dd3dfedba81525db9290225d3639d7751e72e272 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 1 Dec 2017 19:12:33 -0800 Subject: [PATCH] Cleanup CI files for scenario007 on baremetal We only run container job on master now. Depends-On: I2b54bfe1ed45ceaf18f8b58c9b0f423b4c5795d5 Change-Id: I40c962e637f135d5a7cc944ac8f3969cc033bdd1 --- ci/environments/scenario007-multinode.yaml | 76 ---------------------- 1 file changed, 76 deletions(-) delete mode 100644 ci/environments/scenario007-multinode.yaml diff --git a/ci/environments/scenario007-multinode.yaml b/ci/environments/scenario007-multinode.yaml deleted file mode 100644 index 8077219455..0000000000 --- a/ci/environments/scenario007-multinode.yaml +++ /dev/null @@ -1,76 +0,0 @@ -resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml - OS::TripleO::Services::RabbitMQ: ../../puppet/services/pacemaker/rabbitmq.yaml - OS::TripleO::Services::HAproxy: ../../puppet/services/pacemaker/haproxy.yaml - OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml - OS::TripleO::Services::MySQL: ../../puppet/services/pacemaker/database/mysql.yaml - OS::TripleO::Services::Keepalived: OS::Heat::None - OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml - OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml - OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml - # Disable neutron services not required for OVN and enable services required for OVN. - OS::TripleO::Services::NeutronL3Agent: OS::Heat::None - OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None - OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN - OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None - OS::TripleO::Services::OVNController: ../../puppet/services/ovn-controller.yaml - OS::TripleO::Services::OVNDBs: ../../puppet/services/ovn-dbs.yaml - -parameter_defaults: - ControllerServices: - - OS::TripleO::Services::Clustercheck - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Kernel - - OS::TripleO::Services::Keystone - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::HeatApi - - OS::TripleO::Services::HeatApiCfn - - OS::TripleO::Services::HeatEngine - - OS::TripleO::Services::MySQL - - OS::TripleO::Services::MySQLClient - - OS::TripleO::Services::NeutronServer - - OS::TripleO::Services::NeutronCorePlugin - - OS::TripleO::Services::OVNDBs - - OS::TripleO::Services::OVNController - - OS::TripleO::Services::RabbitMQ - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::Keepalived - - OS::TripleO::Services::Memcached - - OS::TripleO::Services::Pacemaker - - OS::TripleO::Services::NovaConductor - - OS::TripleO::Services::NovaApi - - OS::TripleO::Services::NovaPlacement - - OS::TripleO::Services::NovaMetadata - - OS::TripleO::Services::NovaScheduler - - OS::TripleO::Services::Ntp - - OS::TripleO::Services::Snmp - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::TripleoFirewall - - OS::TripleO::Services::Sshd - ControllerExtraConfig: - nova::compute::libvirt::services::libvirt_virt_type: qemu - nova::compute::libvirt::libvirt_virt_type: qemu - # For OVN. - NeutronMechanismDrivers: ovn - OVNVifType: ovs - OVNNeutronSyncMode: log - OVNQosDriver: ovn-qos - OVNTunnelEncapType: geneve - NeutronEnableDHCPAgent: false - NeutronTypeDrivers: 'geneve,vlan,flat,vxlan' - NeutronNetworkType: 'geneve' - NeutronServicePlugins: 'qos,networking_ovn.l3.l3_ovn.OVNL3RouterPlugin' - NeutronVniRanges: ['1:65536', ] - OVNBridgeMappings: 'datacentre:br-ex' - Debug: true - # we don't deploy Swift so we switch to file backend. - GlanceBackend: 'file' - KeystoneTokenProvider: 'fernet' - SwiftCeilometerPipelineEnabled: false