Merge "ovn-db standalone: Create ovndbs before starting the OVN ovsdb…

… servers" into stable/train
openstack-archive · Dec 5, 2019 · c63b77b · c63b77b
2 parents 9a0d74a + 0f1ffe9
commit c63b77b
Showing 1 changed file with 35 additions and 2 deletions.
diff --git a/deployment/ovn/ovn-dbs-container-puppet.yaml b/deployment/ovn/ovn-dbs-container-puppet.yaml
@@ -137,10 +137,43 @@ outputs:
               owner: root:root
               recurse: true
       docker_config:
+        step_3:
+          ovn_north_db_init:
+            image: &northd_db_image {get_param: ContainerOvnNbDbImage}
+            net: host
+            privileged: false
+            detach: false
+            user: root
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/ovn_north_db_server.json:/var/lib/kolla/config_files/config.json:ro
+                  - /lib/modules:/lib/modules:ro
+                  - /var/lib/openvswitch/ovn:/var/lib/openvswitch:shared,z
+                  - /var/lib/openvswitch/ovn:/run/openvswitch:shared,z
+                  - /var/log/containers/openvswitch:/var/log/openvswitch:z
+            command: "ovsdb-tool create /var/lib/openvswitch/ovnnb.db /usr/share/openvswitch/ovn-nb.ovsschema"
+          ovn_south_db_init:
+            image: &south_db_image {get_param: ContainerOvnSbDbImage}
+            net: host
+            privileged: false
+            detach: false
+            user: root
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/ovn_north_db_server.json:/var/lib/kolla/config_files/config.json:ro
+                  - /lib/modules:/lib/modules:ro
+                  - /var/lib/openvswitch/ovn:/var/lib/openvswitch:shared,z
+                  - /var/lib/openvswitch/ovn:/run/openvswitch:shared,z
+                  - /var/log/containers/openvswitch:/var/log/openvswitch:z
+            command: "ovsdb-tool create /var/lib/openvswitch/ovnsb.db /usr/share/openvswitch/ovn-sb.ovsschema"
         step_4:
           ovn_north_db_server:
             start_order: 0
-            image: {get_param: ContainerOvnNbDbImage}
+            image: *northd_db_image
             net: host
             privileged: false
             restart: always
@@ -157,7 +190,7 @@ outputs:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
           ovn_south_db_server:
             start_order: 0
-            image: {get_param: ContainerOvnSbDbImage}
+            image: *south_db_image
             net: host
             privileged: false
             restart: always