Enable OVN baremetal by default with Ironic service

Switch overcloud Ironic to OVN baremetal and distinguish undercloud
ironic config from overcloud ironic config. Currently undercloud is
using ML2/OVS and will need 'openvswitch' driver there while the
overcloud default driver has now been shifted to ML2/OVN.
Hence we need to split the ironic environment to cover both scenarios.

Change-Id: I754edb68a715b6386a77684d9a72af64e4f188b2
This commit is contained in:
Kamil Sambor 2019-02-19 16:04:20 +01:00
parent d35fa30721
commit 9b5cb4b3aa
2 changed files with 11 additions and 1 deletions

View File

@ -576,7 +576,7 @@ topics:
description: Deploy Sahara service
requires:
- overcloud-resource-registry-puppet.yaml
- file: environments/services/ironic.yaml
- file: environments/services/ironic-overcloud.yaml
title: Ironic
description: Deploy Ironic service
requires:

View File

@ -0,0 +1,10 @@
parameter_defaults:
NeutronMechanismDrivers: ['ovn', 'baremetal']
resource_registry:
OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml
OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml
OS::TripleO::Services::IronicPxe: ../../deployment/ironic/ironic-pxe-container-puppet.yaml
OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml
OS::TripleO::Services::IronicNeutronAgent: ../../deployment/ironic/ironic-neutron-agent-container-puppet.yaml
OS::TripleO::Services::NeutronDhcpAgent: ../../deployment/neutron/neutron-dhcp-container-puppet.yaml