diff options
-rwxr-xr-x | mcp/config/states/dpdk | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk index efe1dafe5..65832db84 100755 --- a/mcp/config/states/dpdk +++ b/mcp/config/states/dpdk @@ -16,4 +16,4 @@ salt -I 'nova:compute' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch salt -I 'nova:compute' service.restart openvswitch-switch # Set datapath type to netdev for public bridge -salt -I 'nova:compute' cmd.run 'ovs-vsctl set bridge br-floating datapath_type=netdev' +salt -I 'nova:compute' cmd.run 'ovs-vsctl br-exists br-floating && ovs-vsctl set bridge br-floating datapath_type=netdev' ignore_retcode=True diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml index 7f81a4ae3..795a7d892 100644 --- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml @@ -33,6 +33,8 @@ parameters: mechanism: ovn: driver: ovn + database: + host: ${_param:opnfv_openstack_database_address} ovn_ctl_opts: db-nb-create-insecure-remote: 'yes' db-sb-create-insecure-remote: 'yes' |