From 402e66aca9e871e4c5b9c9d669c58db5bcd960f8 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Tue, 11 Apr 2017 17:57:46 +0400
Subject: [PATCH] Split out openstack-cinder task

openstack-cinder task has been splitted out to avoid race condition
when syncdb ain't completed (or even not started yet) on primary
controller before a cinder-api service start up on secondary ones.

Change-Id: Ic506ba6f5b5908a71eca52a077d8bd6084655dc6
Closes-Bug: #1681686
---
 .../examples/openstack-cinder/tasks.yaml      | 40 ++++++++++++-------
 .../osnailyfacter/modular/ceph/tasks.yaml     |  2 +-
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/deployment/puppet/openstack_tasks/examples/openstack-cinder/tasks.yaml b/deployment/puppet/openstack_tasks/examples/openstack-cinder/tasks.yaml
index 672476908e..676e1bf603 100644
--- a/deployment/puppet/openstack_tasks/examples/openstack-cinder/tasks.yaml
+++ b/deployment/puppet/openstack_tasks/examples/openstack-cinder/tasks.yaml
@@ -1,9 +1,9 @@
-- id: openstack-cinder
+- id: primary-openstack-cinder
   type: puppet
   version: 2.2.0
-  tags: [primary-controller, controller]
-  required_for: [deploy_end, openstack-controller]
-  requires: [primary-keystone, keystone, hosts, firewall]
+  tags: [primary-controller]
+  required_for: [deploy_end, primary-openstack-controller]
+  requires: [primary-keystone, hosts, firewall]
   cross-depends:
     - name: /^(primary-)?keystone$/
     - name: hosts
@@ -13,14 +13,13 @@
     - name: /^(primary-)?rabbitmq$/
     - name: cinder-db
     - name: cinder-keystone
-
   cross-depended-by:
-    - name: openstack-controller
+    - name: primary-openstack-controller
       role: self
     - name: deploy_end
       role: self
   condition:
-    yaql_exp: >
+    yaql_exp: &cinder >
       changedAny($.network_scheme, $.cinder, $.network_metadata.vips,
       $.get('cinder_volume_group'), $.storage, $.ceilometer, $.sahara,
       $.rabbit, $.get('region', 'RegionOne'), $.get('use_ssl'),
@@ -39,16 +38,31 @@
     puppet_modules: /etc/puppet/modules
     timeout: 1200
 
+- id: openstack-cinder
+  type: puppet
+  version: 2.2.0
+  tags: [controller]
+  required_for: [deploy_end, openstack-controller]
+  requires: [keystone, hosts, firewall]
+  cross-depends:
+    - name: /^(primary-)?keystone$/
+    - name: /^(primary-)?rabbitmq$/
+    - name: primary-openstack-cinder
+  condition:
+    yaql_exp: *cinder
+  parameters:
+    puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-cinder/openstack-cinder.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 1200
+
 - id: cinder-db
   type: puppet
   version: 2.2.0
   tags: [primary-database]
-  required_for: [openstack-cinder]
+  required_for: [primary-openstack-cinder]
   requires: [primary-database, database]
   cross-depends:
     - name: /^(primary-)?database$/
-  cross-depened-by:
-    - name: openstack-cinder
   condition:
     yaql_exp: >
       changedAny($.cinder, $.mysql, $.network_metadata.vips,
@@ -64,13 +78,11 @@
   type: puppet
   version: 2.2.0
   tags: [primary-keystone]
-  required_for: [openstack-cinder]
+  required_for: [primary-openstack-cinder]
   requires: [primary-keystone, keystone]
   cross-depends:
     - name: /^(primary-)?keystone$/
       role: self
-  cross-depended-by:
-    - name: openstack-cinder
   condition:
     yaql_exp: >
       changedAny($.cinder, $.public_ssl, $.get('use_ssl'),
@@ -84,7 +96,7 @@
   type: puppet
   version: 2.1.0
   groups: [primary-controller]
-  requires: [openstack-cinder]
+  requires: [primary-openstack-cinder]
   required_for: [deploy_end]
   condition:
     yaql_exp: "changed($.storage)"
diff --git a/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml b/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml
index 70efe2f381..474a7ccf7a 100644
--- a/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml
@@ -24,7 +24,7 @@
   version: 2.1.0
   groups: [primary-controller]
   required_for: [deploy_end, controller_remaining_tasks]
-  requires: [primary-openstack-controller, openstack-controller, openstack-cinder]
+  requires: [primary-openstack-controller, primary-openstack-cinder]
   condition:
     yaql_exp: &ceph_mon >
       ($.storage.objects_ceph or $.storage.images_ceph or