Merge "neutron: Call destroy-patch-ports before starting ovs-agent"

docker/services/neutron-ovs-agent.yaml

@@ -88,11 +88,7 @@ outputs:
           - /run/openvswitch:/run/openvswitch
       kolla_config:
         /var/lib/kolla/config_files/neutron_ovs_agent.json:
-          command:
-            list_join:
-              - ' '
-              - - /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron/conf.d/common
-                - get_attr: [NeutronLogging, cmd_extra_args]
+          command: /neutron_ovs_agent_launcher.sh
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -102,6 +98,14 @@ outputs:
             - path: /var/log/neutron
               owner: neutron:neutron
               recurse: true
+      docker_config_scripts:
+        neutron_ovs_agent_launcher.sh:
+          mode: "0755"
+          content: |
+            #!/bin/bash
+            set -xe
+            /usr/bin/python -m neutron.cmd.destroy_patch_ports --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-openvswitch-agent
+            /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron/conf.d/common --log-file=/var/log/neutron/openvswitch-agent.log
       docker_config:
         step_3:
           neutron_ovs_bridge:
@@ -151,6 +155,7 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/docker-config-scripts/neutron_ovs_agent_launcher.sh:/neutron_ovs_agent_launcher.sh:ro
                   - /lib/modules:/lib/modules:ro
                   - /run/openvswitch:/run/openvswitch
             environment: