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
This commit is contained in:
Alex Schultz 2017-11-28 12:15:14 -07:00
parent 3d3169e473
commit c54c6222d8
6 changed files with 6 additions and 0 deletions

View File

@ -135,6 +135,7 @@ outputs:
step_4:
map_merge:
- neutron_api:
start_order: 0
image: *neutron_api_image
net: host
privileged: false

View File

@ -92,6 +92,7 @@ outputs:
docker_config:
step_4:
neutron_dhcp:
start_order: 10
image: {get_param: DockerNeutronDHCPImage}
net: host
pid: host

View File

@ -90,6 +90,7 @@ outputs:
docker_config:
step_4:
neutron_l3_agent:
start_order: 10
image: {get_param: DockerNeutronL3AgentImage}
net: host
pid: host

View File

@ -90,6 +90,7 @@ outputs:
docker_config:
step_4:
neutron_metadata_agent:
start_order: 10
image: {get_param: DockerNeutronMetadataImage}
net: host
pid: host

View File

@ -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

View File

@ -85,6 +85,7 @@ outputs:
docker_config:
step_4:
neutron_sriov_agent:
start_order: 10
image: {get_param: DockerNeutronSriovImage}
net: host
pid: host