From 9b5cb4b3aa300329caa792dbb730edb8d0b94bc2 Mon Sep 17 00:00:00 2001 From: Kamil Sambor Date: Tue, 19 Feb 2019 16:04:20 +0100 Subject: [PATCH] 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 --- capabilities-map.yaml | 2 +- environments/services/ironic-overcloud.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 environments/services/ironic-overcloud.yaml diff --git a/capabilities-map.yaml b/capabilities-map.yaml index c9cbe94c31..9d247b4a17 100644 --- a/capabilities-map.yaml +++ b/capabilities-map.yaml @@ -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: diff --git a/environments/services/ironic-overcloud.yaml b/environments/services/ironic-overcloud.yaml new file mode 100644 index 0000000000..2284e3cca8 --- /dev/null +++ b/environments/services/ironic-overcloud.yaml @@ -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 \ No newline at end of file