From c54c6222d8b517b8ee492caddaf47d2ef5780f31 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 28 Nov 2017 12:15:14 -0700
Subject: [PATCH] Fix neutron agent start order

In the baremetal deployment, we used to ensure that neutron-server was
started prior to starting up the various agents. In the containerized
deployment we need to ensure that we launch the agents after the server
has been started. We can do this by configuring a start_order for each
of the services.

It should be noted that the ovs agent was actually configured to start
in step5 on baremetal due to previous race conditions under HA
deployments. This change leaves it in step4 but configures the
start_order to be after the neutron-api service.

Change-Id: I3794400ef5c8ae620961914831ff85e3438b0399
Closes-Bug: #1734976
Related-Bug: #1663273
---
 docker/services/neutron-api.yaml         | 1 +
 docker/services/neutron-dhcp.yaml        | 1 +
 docker/services/neutron-l3.yaml          | 1 +
 docker/services/neutron-metadata.yaml    | 1 +
 docker/services/neutron-ovs-agent.yaml   | 1 +
 docker/services/neutron-sriov-agent.yaml | 1 +
 6 files changed, 6 insertions(+)

diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index fe048cc6d0..143e6f913f 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -135,6 +135,7 @@ outputs:
         step_4:
           map_merge:
             - neutron_api:
+                start_order: 0
                 image: *neutron_api_image
                 net: host
                 privileged: false
diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml
index f29d7ebf28..ef5a23ada6 100644
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@@ -92,6 +92,7 @@ outputs:
       docker_config:
         step_4:
           neutron_dhcp:
+            start_order: 10
             image: {get_param: DockerNeutronDHCPImage}
             net: host
             pid: host
diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index 48516aee87..332428149a 100644
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -90,6 +90,7 @@ outputs:
       docker_config:
         step_4:
           neutron_l3_agent:
+            start_order: 10
             image: {get_param: DockerNeutronL3AgentImage}
             net: host
             pid: host
diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml
index bbb2932762..4641ff3231 100644
--- a/docker/services/neutron-metadata.yaml
+++ b/docker/services/neutron-metadata.yaml
@@ -90,6 +90,7 @@ outputs:
       docker_config:
         step_4:
           neutron_metadata_agent:
+            start_order: 10
             image: {get_param: DockerNeutronMetadataImage}
             net: host
             pid: host
diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml
index 518db30472..ac8fa0ff87 100644
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -122,6 +122,7 @@ outputs:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
         step_4:
           neutron_ovs_agent:
+            start_order: 10
             image: {get_param: DockerOpenvswitchImage}
             net: host
             pid: host
diff --git a/docker/services/neutron-sriov-agent.yaml b/docker/services/neutron-sriov-agent.yaml
index 0b06de13f0..c96a413e6a 100644
--- a/docker/services/neutron-sriov-agent.yaml
+++ b/docker/services/neutron-sriov-agent.yaml
@@ -85,6 +85,7 @@ outputs:
       docker_config:
         step_4:
           neutron_sriov_agent:
+            start_order: 10
             image: {get_param: DockerNeutronSriovImage}
             net: host
             pid: host