From 8de49541b8287c9203c269ba6526f3a912308d9c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Fri, 17 Aug 2018 14:08:28 +0200
Subject: [PATCH] Always start cinder API last

Cinder api was started last until a recent commit introduced a
regression by changing the order [1].

This reverts it.

[1]: https://github.com/openstack/openstack-ansible-os_cinder/commit/12ea9635ff5f4d4dd9eee068e7ce27fb84a52846

Change-Id: Iba0c0c170e6bb8f1b9e414ddad3426dd777ab894
---
 defaults/main.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 17cfa5c1..ac3962b4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -306,11 +306,19 @@ cinder_services:
     start_order: 2
     execstarts: "{{ cinder_bin }}/cinder-volume"
     execreloads: "/bin/kill -HUP $MAINPID"
+  cinder-backup:
+    group: cinder_backup
+    service_name: cinder-backup
+    condition: "{{ cinder_service_backup_program_enabled | bool }}"
+    init_config_overrides: "{{ cinder_backup_init_overrides }}"
+    start_order: 3
+    execstarts: "{{ cinder_bin }}/cinder-backup"
+    execreloads: "/bin/kill -HUP $MAINPID"
   cinder-api:
     group: cinder_api
     service_name: cinder-api
     init_config_overrides: "{{ cinder_api_init_overrides }}"
-    start_order: 3
+    start_order: 4
     execstarts: "{{ cinder_uwsgi_bin }}/uwsgi --autoload --ini /etc/uwsgi/cinder-api.ini"
     execreloads: "{{ cinder_uwsgi_bin }}/uwsgi --reload /var/run/cinder-api/cinder-api.pid"
     wsgi_overrides: "{{ cinder_api_uwsgi_ini_overrides }}"
@@ -318,14 +326,6 @@ cinder_services:
     wsgi_name: cinder-wsgi
     uwsgi_port: "{{ cinder_service_port }}"
     uwsgi_bind_address: "{{ cinder_uwsgi_bind_address }}"
-  cinder-backup:
-    group: cinder_backup
-    service_name: cinder-backup
-    condition: "{{ cinder_service_backup_program_enabled | bool }}"
-    init_config_overrides: "{{ cinder_backup_init_overrides }}"
-    start_order: 4
-    execstarts: "{{ cinder_bin }}/cinder-backup"
-    execreloads: "/bin/kill -HUP $MAINPID"
 
 # Cinder uWSGI settings
 cinder_wsgi_processes_max: 16