openstack
/
tacker
Code Issues Proposed changes

Merge "Update examples of local.conf for OVN"

This commit is contained in:
Zuul 2021-07-27 15:36:17 +00:00 committed by Gerrit Code Review
parent 1951c2bd73 55f3a221be
commit 67685f06bf
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/local.conf.example
View File

@ -29,10 +29,9 @@ ENABLE_VERBOSE_LOG_LEVEL=True
# Neutron ML2 with OpenVSwitch
Q_PLUGIN=ml2
Q_AGENT=openvswitch
Q_AGENT=ovn
# Disable security groups
Q_USE_SECGROUP=False
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
# Enable heat, networking-sfc, barbican and mistral

7
devstack/local.conf.kubernetes
View File

@ -29,10 +29,9 @@ ENABLE_VERBOSE_LOG_LEVEL=True
# Neutron ML2 with OpenVSwitch
Q_PLUGIN=ml2
Q_AGENT=openvswitch
Q_AGENT=ovn
# Disable security groups
Q_USE_SECGROUP=False
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
# Enable neutron, heat, networking-sfc, barbican and mistral
@ -65,6 +64,10 @@ enable_plugin octavia https://opendev.org/openstack/octavia master
enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container master
#KURYR_K8S_CLUSTER_IP_RANGE="10.0.0.0/24"
enable_service kubernetes-master
enable_service kuryr-kubernetes
enable_service kuryr-daemon
[[post-config|/etc/neutron/dhcp_agent.ini]]
[DEFAULT]
enable_isolated_metadata = True

1
devstack/local.conf.standalone
View File

@ -4,6 +4,7 @@
############################################################
HOST_IP=127.0.0.1
SERVICE_HOST=127.0.0.1
SERVICE_PASSWORD=devstack
ADMIN_PASSWORD=devstack
SERVICE_TOKEN=devstack

10
devstack/settings
View File

@ -38,14 +38,6 @@ if [ "${TACKER_MODE}" == "all" ]; then
disable_service n-net
VIRT_DRIVER=libvirt
# TACKER_NEUTRON_AGENTS can be disabled by adding
# TACKER_NEUTRON_AGENTS='' in local.conf if neutron agents are running on a separate node
TACKER_NEUTRON_AGENTS=${TACKER_NEUTRON_AGENTS:-q-agt,q-dhcp,q-meta,q-l3}
for i in $(echo $TACKER_NEUTRON_AGENTS | sed 's/,/ /g')
do
enable_service $i
done
enable_service q-svc
enable_service neutron
@ -64,7 +56,7 @@ if [ "${TACKER_MODE}" == "all" ]; then
done
# enable kuryr-kubernetes services
KURYR_KUBERNETES_AGENTS=${KURYR_KUBERNETES_AGENTS:-etcd3,kubernetes-api,kubernetes-controller-manager,kubernetes-scheduler,kubelet,kuryr-kubernetes,kuryr-daemon}
KURYR_KUBERNETES_AGENTS=${KURYR_KUBERNETES_AGENTS:-kubernetes-master,kuryr-kubernetes,kuryr-daemon}
for i in $(echo $KURYR_KUBERNETES_AGENTS | sed 's/,/ /g')
do
enable_service $i