summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-04-11 17:57:46 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-04-12 12:06:43 +0400
commit402e66aca9e871e4c5b9c9d669c58db5bcd960f8 (patch)
treee138df8ee0bbb9e597bbde74acb5208207521229
parenta5abfc28aacc48afd70d428d2600c55de0a127c8 (diff)
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
Notes
Notes (review): Code-Review+2: Stanislaw Bogatkin <sbogatkin@mirantis.com> Code-Review+1: Oleksiy Molchanov <omolchanov@mirantis.com> Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+1: Alex Schultz <aschultz@redhat.com> Code-Review+1: Denis Egorenko <egorenko.den@gmail.com> Workflow+1: Denis Egorenko <egorenko.den@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 20 Apr 2017 13:19:22 +0000 Reviewed-on: https://review.openstack.org/455721 Project: openstack/fuel-library Branch: refs/heads/master
-rw-r--r--deployment/puppet/openstack_tasks/examples/openstack-cinder/tasks.yaml40
-rw-r--r--deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml2
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 6724769..676e1bf 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 @@
1- id: openstack-cinder 1- id: primary-openstack-cinder
2 type: puppet 2 type: puppet
3 version: 2.2.0 3 version: 2.2.0
4 tags: [primary-controller, controller] 4 tags: [primary-controller]
5 required_for: [deploy_end, openstack-controller] 5 required_for: [deploy_end, primary-openstack-controller]
6 requires: [primary-keystone, keystone, hosts, firewall] 6 requires: [primary-keystone, hosts, firewall]
7 cross-depends: 7 cross-depends:
8 - name: /^(primary-)?keystone$/ 8 - name: /^(primary-)?keystone$/
9 - name: hosts 9 - name: hosts
@@ -13,14 +13,13 @@
13 - name: /^(primary-)?rabbitmq$/ 13 - name: /^(primary-)?rabbitmq$/
14 - name: cinder-db 14 - name: cinder-db
15 - name: cinder-keystone 15 - name: cinder-keystone
16
17 cross-depended-by: 16 cross-depended-by:
18 - name: openstack-controller 17 - name: primary-openstack-controller
19 role: self 18 role: self
20 - name: deploy_end 19 - name: deploy_end
21 role: self 20 role: self
22 condition: 21 condition:
23 yaql_exp: > 22 yaql_exp: &cinder >
24 changedAny($.network_scheme, $.cinder, $.network_metadata.vips, 23 changedAny($.network_scheme, $.cinder, $.network_metadata.vips,
25 $.get('cinder_volume_group'), $.storage, $.ceilometer, $.sahara, 24 $.get('cinder_volume_group'), $.storage, $.ceilometer, $.sahara,
26 $.rabbit, $.get('region', 'RegionOne'), $.get('use_ssl'), 25 $.rabbit, $.get('region', 'RegionOne'), $.get('use_ssl'),
@@ -39,16 +38,31 @@
39 puppet_modules: /etc/puppet/modules 38 puppet_modules: /etc/puppet/modules
40 timeout: 1200 39 timeout: 1200
41 40
41- id: openstack-cinder
42 type: puppet
43 version: 2.2.0
44 tags: [controller]
45 required_for: [deploy_end, openstack-controller]
46 requires: [keystone, hosts, firewall]
47 cross-depends:
48 - name: /^(primary-)?keystone$/
49 - name: /^(primary-)?rabbitmq$/
50 - name: primary-openstack-cinder
51 condition:
52 yaql_exp: *cinder
53 parameters:
54 puppet_manifest: /etc/puppet/modules/openstack_tasks/examples/openstack-cinder/openstack-cinder.pp
55 puppet_modules: /etc/puppet/modules
56 timeout: 1200
57
42- id: cinder-db 58- id: cinder-db
43 type: puppet 59 type: puppet
44 version: 2.2.0 60 version: 2.2.0
45 tags: [primary-database] 61 tags: [primary-database]
46 required_for: [openstack-cinder] 62 required_for: [primary-openstack-cinder]
47 requires: [primary-database, database] 63 requires: [primary-database, database]
48 cross-depends: 64 cross-depends:
49 - name: /^(primary-)?database$/ 65 - name: /^(primary-)?database$/
50 cross-depened-by:
51 - name: openstack-cinder
52 condition: 66 condition:
53 yaql_exp: > 67 yaql_exp: >
54 changedAny($.cinder, $.mysql, $.network_metadata.vips, 68 changedAny($.cinder, $.mysql, $.network_metadata.vips,
@@ -64,13 +78,11 @@
64 type: puppet 78 type: puppet
65 version: 2.2.0 79 version: 2.2.0
66 tags: [primary-keystone] 80 tags: [primary-keystone]
67 required_for: [openstack-cinder] 81 required_for: [primary-openstack-cinder]
68 requires: [primary-keystone, keystone] 82 requires: [primary-keystone, keystone]
69 cross-depends: 83 cross-depends:
70 - name: /^(primary-)?keystone$/ 84 - name: /^(primary-)?keystone$/
71 role: self 85 role: self
72 cross-depended-by:
73 - name: openstack-cinder
74 condition: 86 condition:
75 yaql_exp: > 87 yaql_exp: >
76 changedAny($.cinder, $.public_ssl, $.get('use_ssl'), 88 changedAny($.cinder, $.public_ssl, $.get('use_ssl'),
@@ -84,7 +96,7 @@
84 type: puppet 96 type: puppet
85 version: 2.1.0 97 version: 2.1.0
86 groups: [primary-controller] 98 groups: [primary-controller]
87 requires: [openstack-cinder] 99 requires: [primary-openstack-cinder]
88 required_for: [deploy_end] 100 required_for: [deploy_end]
89 condition: 101 condition:
90 yaql_exp: "changed($.storage)" 102 yaql_exp: "changed($.storage)"
diff --git a/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml b/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml
index 70efe2f..474a7cc 100644
--- a/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml
@@ -24,7 +24,7 @@
24 version: 2.1.0 24 version: 2.1.0
25 groups: [primary-controller] 25 groups: [primary-controller]
26 required_for: [deploy_end, controller_remaining_tasks] 26 required_for: [deploy_end, controller_remaining_tasks]
27 requires: [primary-openstack-controller, openstack-controller, openstack-cinder] 27 requires: [primary-openstack-controller, primary-openstack-cinder]
28 condition: 28 condition:
29 yaql_exp: &ceph_mon > 29 yaql_exp: &ceph_mon >
30 ($.storage.objects_ceph or $.storage.images_ceph or 30 ($.storage.objects_ceph or $.storage.images_ceph or