Merge pull request #7889 from dulek/kuryr-syncup

Adjust Kuryr CNI definitions for new Docker image

roles/kuryr/templates/cni-daemonset.yaml.j2

@@ -33,6 +33,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: KURYR_CNI_POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         securityContext:
           privileged: true
         volumeMounts:
@@ -41,10 +45,8 @@ spec:
         - name: net-conf
           mountPath: /etc/cni/net.d
         - name: config-volume
-          mountPath: /tmp/kuryr/kuryr.conf
+          mountPath: /etc/kuryr/kuryr.conf
           subPath: kuryr-cni.conf
-        - name: etc
-          mountPath: /etc
         - name: proc
           mountPath: /host_proc
         - name: openvswitch
@@ -71,9 +73,6 @@ spec:
         - name: config-volume
           configMap:
             name: kuryr-config
-        - name: etc
-          hostPath:
-            path: /etc
         - name: proc
           hostPath:
             path: /proc

roles/kuryr/templates/configmap.yaml.j2

@@ -653,13 +653,6 @@ 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') }}
-
     [cni_health_server]
     port = {{ kuryr_healthcheck_port }}