openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "Use /var/run instead of /var/run/openvswitch"

Browse Source
This commit is contained in:
Zuul 2018-12-07 11:13:13 +00:00 committed by Gerrit Code Review
commit 5a41fb9dc6
6 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.d/sdn.yaml
View File

@ -26,7 +26,7 @@
neutron: https://git.openstack.org/openstack/neutron neutron: https://git.openstack.org/openstack/neutron
vars: vars:
devstack_localrc: devstack_localrc:
OVS_HOST_PATH: /usr/local/var/run/openvswitch VAR_RUN_PATH: /usr/local/var/run
Q_USE_PROVIDERNET_FOR_PUBLIC: true Q_USE_PROVIDERNET_FOR_PUBLIC: true
PHYSICAL_NETWORK: public PHYSICAL_NETWORK: public
OVN_L3_CREATE_PUBLIC_NETWORK: true OVN_L3_CREATE_PUBLIC_NETWORK: true

8
devstack/lib/kuryr_kubernetes
View File

@ -668,10 +668,10 @@ spec:
- name: proc - name: proc
mountPath: /host_proc mountPath: /host_proc
EOF EOF
if [[ -n "$OVS_HOST_PATH" ]]; then if [[ -n "$VAR_RUN_PATH" ]]; then
cat >> "${output_dir}/cni_ds.yml" << EOF cat >> "${output_dir}/cni_ds.yml" << EOF
- name: openvswitch - name: openvswitch
mountPath: /var/run/openvswitch mountPath: /var/run
EOF EOF
fi fi
if [ "$cni_daemon" == "True" ]; then if [ "$cni_daemon" == "True" ]; then
@ -705,11 +705,11 @@ EOF
hostPath: hostPath:
path: /proc path: /proc
EOF EOF
if [[ -n "$OVS_HOST_PATH" ]]; then if [[ -n "$VAR_RUN_PATH" ]]; then
cat >> "${output_dir}/cni_ds.yml" << EOF cat >> "${output_dir}/cni_ds.yml" << EOF
- name: openvswitch - name: openvswitch
hostPath: hostPath:
path: ${OVS_HOST_PATH} path: ${VAR_RUN_PATH}
EOF EOF
fi fi
} }

6
devstack/local.conf.ovn.sample
View File

@ -36,10 +36,10 @@ enable_service networking-ovn-metadata-agent
enable_service neutron enable_service neutron
enable_service q-svc enable_service q-svc
# OVS HOST PATH # VAR RUN PATH
# ============= # =============
# OVS_HOST_PATH=/var/run/openvswitch # VAR_RUN_PATH=/var/run
OVS_HOST_PATH=/usr/local/var/run/openvswitch VAR_RUN_PATH=/usr/local/var/run
# OCTAVIA # OCTAVIA
KURYR_K8S_LBAAS_USE_OCTAVIA=True KURYR_K8S_LBAAS_USE_OCTAVIA=True

4
devstack/local.conf.sample
View File

@ -33,9 +33,9 @@ enable_service q-dhcp
enable_service q-l3 enable_service q-l3
enable_service q-svc enable_service q-svc
# OVS HOST PATH # VAR RUN PATH
# ============= # =============
# OVS_HOST_PATH=/var/run/openvswitch # VAR_RUN_PATH=/var/run
# OCTAVIA # OCTAVIA
KURYR_K8S_LBAAS_USE_OCTAVIA=True KURYR_K8S_LBAAS_USE_OCTAVIA=True

2
devstack/settings
View File

@ -86,7 +86,7 @@ KURYR_VIF_POOL_MANAGER=${KURYR_VIF_POOL_MANAGER:-False}
KURYR_HEALTH_SERVER_PORT=${KURYR_HEALTH_SERVER_PORT:-8082} KURYR_HEALTH_SERVER_PORT=${KURYR_HEALTH_SERVER_PORT:-8082}
# OVS HOST PATH # OVS HOST PATH
OVS_HOST_PATH=${OVS_HOST_PATH:-/var/run/openvswitch} VAR_RUN_PATH=${VAR_RUN_PATH:-/var/run}
# Health Server # Health Server
KURYR_CNI_HEALTH_SERVER_PORT=${KURYR_CNI_HEALTH_SERVER_PORT:-8090} KURYR_CNI_HEALTH_SERVER_PORT=${KURYR_CNI_HEALTH_SERVER_PORT:-8090}

9
doc/source/installation/containerized.rst
View File

@ -108,6 +108,15 @@ This should generate 5 files in your ``<output_dir>``:
* controller_deployment.yml * controller_deployment.yml
* cni_ds.yml * cni_ds.yml
.. note::
kuryr-cni daemonset mounts /var/run, due to necessity of accessing to several sub directories
like openvswitch and auxiliary directory for vhostuser configuration and socket files. Also when
neutron-openvswitch-agent works with datapath_type = netdev configuration option, kuryr-kubernetes
has to move vhostuser socket to auxilary directory, that auxiliary directory should be on the same
mount point, otherwise connection of this socket will be refused.
In case when Open vSwitch keeps vhostuser socket files not in /var/run/openvswitch, openvswitch
mount point in cni_ds.yaml and [vhostuser] section in config_map.yml should be changed properly.
Deploying Kuryr resources on Kubernetes Deploying Kuryr resources on Kubernetes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~