diff --git a/Vagrantfile b/Vagrantfile index 5a31fc3..f022c94 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -40,7 +40,7 @@ TOX_ENVLIST = ENV.fetch('TOX_ENVLIST', '') TOX_EXTRA_ARGS = ENV.fetch('TOX_EXTRA_ARGS', '--notest') # Allow to switch configuration -DEVSTACK_CONF_NAME = ENV.fetch('DEVSTACK_CONF_NAME', 'designate') +DEVSTACK_CONF_NAME = ENV.fetch('DEVSTACK_CONF_NAME', 'octavia') DEVSTACK_LOCAL_CONF_FILE = ENV.fetch( 'DEVSTACK_LOCAL_CONF_FILE', diff --git a/playbooks/vagrant/ovn-octavia/local.conf b/playbooks/vagrant/octavia/local.conf similarity index 88% rename from playbooks/vagrant/ovn-octavia/local.conf rename to playbooks/vagrant/octavia/local.conf index 1f07da0..d7ea23f 100644 --- a/playbooks/vagrant/ovn-octavia/local.conf +++ b/playbooks/vagrant/octavia/local.conf @@ -73,18 +73,35 @@ enable_plugin devstack-plugin-tobiko https://opendev.org/x/devstack-plugin-tobik TOBIKO_NEUTRON_IPV4_DNS_NAMESERVERS=1.1.1.1,8.8.8.8 # Configure Octavia ---------------------------------------------------------- -OCTAVIA_NODE="api" -DISABLE_AMP_IMAGE_BUILD=True +OCTAVIA_NODE=standalone +LIBVIRT_TYPE=kvm +LIBVIRT_CPU_MODE=host-passthrough enable_plugin barbican https://opendev.org/openstack/barbican.git enable_plugin octavia https://opendev.org/openstack/octavia.git enable_plugin octavia-dashboard https://opendev.org/openstack/octavia-dashboard.git +enable_plugin ovn-octavia-provider https://opendev.org/openstack/ovn-octavia-provider.git LIBS_FROM_GIT+=python-octaviaclient enable_service octavia enable_service o-api -enable_service o-hk +enable_service o-cw enable_service o-da -disable_service o-cw -disable_service o-hm +enable_service o-hk +enable_service o-hm + +[[post-config|$OCTAVIA_CONF]] +[amphora_agent] +forward_all_logs = True + +[controller_worker] +loadbalancer_topology = SINGLE + +[haproxy_amphora] +build_active_retries = 300 +connection_max_retries = 1200 + +[[post-config|$NOVA_CONF]] +[scheduler] +discover_hosts_in_cells_interval = 2 # OVN octavia provider plugin ------------------------------------------------- enable_plugin ovn-octavia-provider https://opendev.org/openstack/ovn-octavia-provider.git @@ -97,8 +114,3 @@ enable_service designate-api enable_service designate-worker enable_service designate-producer enable_service designate-mdns - - -[[post-config|$NOVA_CONF]] -[scheduler] -discover_hosts_in_cells_interval = 2