Merge pull request #6962 from esevan/kuryr-cni-conf

Automatic merge from submit-queue.

Add kuryr-kubernetes external lock_path

* Lock path is now configurable to run cni daemon without error.

With devstack-based installation, kuryr conf is properly configured for oslo_concurrency.
However, with byo installation, without this configuration it occurs kuryr daemon down.

Signed-off-by: Eunsoo Park <esevan.park@samsung.com>

roles/kuryr/templates/configmap.yaml.j2

@@ -645,3 +645,10 @@ data:
 
     # Minimun interval (in seconds) between pool updates (integer value)
     ports_pool_update_frequency = {{ kuryr_openstack_pool_update_frequency | default(20) }}
+
+    [oslo_concurrency]
+
+    #
+    # From kuryr_kubernetes
+    #
+    lock_path = {{ kuryr_openstack_lock_path | default('/var/kuryr-lock') }}