ca3d5e47b0
Used by a new featureset[1] that uses the neutron ansible-networking driver to configure the switch providing networking for overcloud ironic nodes such that tenant networks are segregated via vlan. This scenario also sets up ssh keys so that ansible inside the neutron container can ssh to the controller to configure OVS. The new scenario also includes a temporary workaround to upgrade ansible in the neutron container, this can be removed once ansible in the container is v2.5.8+ Also remove scenario011 as the patches that used it never merged and now the tennant networks are working in the overcloud, we'll test with this instead. [1] - https://review.openstack.org/#/c/579601/ Change-Id: Ife83825216ccb96a5f24918f42a757d0c48b0e9d
84 lines
4.1 KiB
YAML
84 lines
4.1 KiB
YAML
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::NovaIronic: ../../docker/services/nova-ironic.yaml
|
|
OS::TripleO::Services::IronicApi: ../../docker/services/ironic-api.yaml
|
|
OS::TripleO::Services::IronicConductor: ../../docker/services/ironic-conductor.yaml
|
|
OS::TripleO::Services::IronicPxe: ../../docker/services/ironic-pxe.yaml
|
|
# These enable Pacemaker
|
|
OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml
|
|
OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml
|
|
OS::TripleO::Services::HAproxy: ../../docker/services/pacemaker/haproxy.yaml
|
|
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
|
|
OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
|
|
OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
|
|
OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
|
|
# Some infra instances don't pass the ping test but are otherwise working.
|
|
# Since the OVB jobs also test this functionality we can shut it off here.
|
|
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
|
|
OS::TripleO::NodeExtraConfigPost: ../common/vbmc_setup.yaml
|
|
OS::TripleO::Services::CinderVolume: ../../docker/services/pacemaker/cinder-volume.yaml
|
|
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
|
|
|
|
parameter_defaults:
|
|
ControllerServices:
|
|
- OS::TripleO::Services::Clustercheck
|
|
- OS::TripleO::Services::ContainerImagePrepare
|
|
- OS::TripleO::Services::Docker
|
|
- OS::TripleO::Services::Keystone
|
|
- OS::TripleO::Services::GlanceApi
|
|
- OS::TripleO::Services::IronicApi
|
|
- OS::TripleO::Services::IronicConductor
|
|
- OS::TripleO::Services::IronicPxe
|
|
- OS::TripleO::Services::MySQL
|
|
- OS::TripleO::Services::MySQLClient
|
|
- OS::TripleO::Services::NeutronDhcpAgent
|
|
- OS::TripleO::Services::NeutronL3Agent
|
|
- OS::TripleO::Services::NeutronMetadataAgent
|
|
- OS::TripleO::Services::NeutronServer
|
|
- OS::TripleO::Services::NeutronCorePlugin
|
|
- OS::TripleO::Services::NeutronOvsAgent
|
|
- OS::TripleO::Services::OsloMessagingRpc
|
|
- OS::TripleO::Services::OsloMessagingNotify
|
|
- OS::TripleO::Services::HAproxy
|
|
- OS::TripleO::Services::Memcached
|
|
- OS::TripleO::Services::Pacemaker
|
|
- OS::TripleO::Services::NovaConductor
|
|
- OS::TripleO::Services::NovaApi
|
|
- OS::TripleO::Services::NovaIronic
|
|
- OS::TripleO::Services::NovaPlacement
|
|
- OS::TripleO::Services::NovaMetadata
|
|
- OS::TripleO::Services::NovaScheduler
|
|
- OS::TripleO::Services::Ntp
|
|
- OS::TripleO::Services::Snmp
|
|
- OS::TripleO::Services::SwiftProxy
|
|
- OS::TripleO::Services::SwiftStorage
|
|
- OS::TripleO::Services::SwiftRingBuilder
|
|
- OS::TripleO::Services::Timezone
|
|
- OS::TripleO::Services::TripleoPackages
|
|
- OS::TripleO::Services::TripleoFirewall
|
|
- OS::TripleO::Services::Sshd
|
|
- OS::TripleO::Services::Iscsid
|
|
- OS::TripleO::Services::CinderApi
|
|
- OS::TripleO::Services::CinderScheduler
|
|
- OS::TripleO::Services::CinderVolume
|
|
|
|
ControllerExtraConfig:
|
|
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
|
nova::compute::libvirt::libvirt_virt_type: qemu
|
|
Debug: true
|
|
DockerPuppetDebug: True
|
|
NotificationDriver: 'noop'
|
|
SwiftCeilometerPipelineEnabled: false
|
|
IronicCleaningDiskErase: 'metadata'
|
|
NovaSchedulerDiscoverHostsInCellsInterval: 15
|
|
NeutronMechanismDrivers: openvswitch,ansible
|
|
NeutronNetworkType: vlan
|
|
NeutronTypeDrivers: local,vxlan,vlan,flat
|
|
IronicDefaultNetworkInterface: neutron
|
|
IronicAutomatedClean: false
|
|
NeutronFlatNetworks: datacentre
|
|
NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399'
|
|
ML2HostConfigs: { "net-ans-br": { "ansible_network_os": "openvswitch", "ansible_host": "127.0.0.1", "ansible_user": "root", "ansible_ssh_private_key_file": "/etc/puppet/ci-key"}}
|
|
NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant'
|