Merge "Disable DVR, move baremetal interface to bridge" into stable/queens
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
index f58cf9e..39d0113 100755
--- a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
@@ -3,7 +3,6 @@
- system.galera.server.database.ironic
- system.keystone.client.service.ironic
- system.nova.compute_ironic.single
-- system.neutron.gateway.ironic
- system.neutron.client.service.ironic
- system.ironic.api.single
- system.ironic.tftpd_hpa
@@ -127,6 +126,15 @@
proto: static
address: ${_param:cluster_baremetal_local_address}
netmask: 255.255.255.0
+ ens_baremetal:
+ enabled: true
+ name: ${_param:baremetal_interface}
+ type: eth
+ proto: manual
+ ovs_bridge: br-baremetal
+ ovs_type: OVSPort
+ ipflush_onchange: true
+ restart_on_ipflush: true
system:
group:
libvirtd:
@@ -134,9 +142,14 @@
name: libvirtd
neutron:
server:
+ dvr: False
ironic_enabled: true
backend:
ironic_vlan_range: 100:1000
+ gateway:
+ agent_mode: legacy
+ compute:
+ agent_mode: legacy
salt:
master:
environment: