Merge "Fix kuryr ansible deployment"

ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2

@@ -26,4 +26,5 @@
     rewriterule23 programname ^(freezer-api|freezer-api_access|freezer-manage).* openstack_python
     rewriterule24 programname ^(octavia-api|octavia-health-manager|octavia-housekeeping|octavia-worker).* openstack_python
     rewriterule25 programname ^(zun-compute).* openstack_python
+    rewriterule26 programname ^(kuryr-server).* openstack_python
 </match>

ansible/roles/kuryr/defaults/main.yml

@@ -14,11 +14,15 @@ kuryr_services:
     enabled: True
     image: "{{ kuryr_image_full }}"
     privileged: True
+    cap_add:
+      - NET_ADMIN
     volumes:
       - "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
+      - "/lib/modules:/lib/modules:ro"
       - "/run:/run:shared"
       - "/usr/lib/docker:/usr/lib/docker"
+      - "kolla_logs:/var/log/kolla/"
 
 
 ####################

ansible/roles/kuryr/handlers/main.yml

@@ -13,6 +13,7 @@
     name: "{{ service.container_name }}"
     image: "{{ service.image }}"
     privileged: "{{ service.privileged | default(False) }}"
+    cap_add: "{{ service.cap_add }}"
     volumes: "{{ service.volumes }}"
   when:
     - action != "config"

ansible/roles/kuryr/tasks/bootstrap.yml

@@ -1,19 +0,0 @@
----
-- name: Running Kuryr bootstrap container
-  vars:
-    kuryr: "{{ kuryr_services['kuryr'] }}"
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ kuryr.image }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_kuryr"
-    restart_policy: "never"
-    volumes: "{{ kuryr.volumes }}"
-  run_once: True
-  delegate_to: "{{ groups[kuryr.group][0] }}"

ansible/roles/kuryr/tasks/config.yml

@@ -81,6 +81,7 @@
     name: "{{ item.value.container_name }}"
     image: "{{ item.value.image }}"
     privileged: "{{ item.value.privileged|default(False) }}"
+    cap_add: "{{ item.value.cap_add }}"
     volumes: "{{ item.value.volumes }}"
   register: check_kuryr_containers
   when:

ansible/roles/kuryr/tasks/deploy.yml

@@ -3,7 +3,5 @@
 
 - include: config.yml
 
-- include: bootstrap.yml
-
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/kuryr/tasks/upgrade.yml

@@ -1,7 +1,5 @@
 ---
 - include: config.yml
 
-- include: bootstrap.yml
-
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/kuryr/templates/kuryr.conf.j2

@@ -1,8 +1,13 @@
 [DEFAULT]
 kuryr_uri = http://{{ api_interface_address }}:{{ kuryr_port }}
 debug = {{ kuryr_logging_debug }}
+log_dir = /var/log/kolla/kuryr
+
+capability_scope = global
+bindir = /var/lib/kolla/venv/libexec/kuryr
 
 [binding]
+driver = kuryr.lib.binding.drivers.veth
 
 [neutron]
 auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}

ansible/roles/kuryr/templates/kuryr.json.j2

@@ -4,7 +4,7 @@
         {
             "source": "{{ container_config_directory }}/kuryr.conf",
             "dest": "/etc/kuryr/kuryr.conf",
-            "owner": "root",
+            "owner": "kuryr",
             "perm": "0600"
         },
         {
@@ -20,5 +20,12 @@
             "perm": "0600",
             "optional": true
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/kuryr",
+            "owner": "kuryr:kolla",
+            "recurse": true
+        }
     ]
 }