Browse Source

Merge "Split out openstack-cinder task"

Jenkins 2 years ago
parent
commit
d703ed79f0

+ 26
- 14
deployment/puppet/openstack_tasks/examples/openstack-cinder/tasks.yaml View File

@@ -1,9 +1,9 @@
1
-- id: openstack-cinder
1
+- id: primary-openstack-cinder
2 2
   type: puppet
3 3
   version: 2.2.0
4
-  tags: [primary-controller, controller]
5
-  required_for: [deploy_end, openstack-controller]
6
-  requires: [primary-keystone, keystone, hosts, firewall]
4
+  tags: [primary-controller]
5
+  required_for: [deploy_end, primary-openstack-controller]
6
+  requires: [primary-keystone, hosts, firewall]
7 7
   cross-depends:
8 8
     - name: /^(primary-)?keystone$/
9 9
     - name: hosts
@@ -13,14 +13,13 @@
13 13
     - name: /^(primary-)?rabbitmq$/
14 14
     - name: cinder-db
15 15
     - name: cinder-keystone
16
-
17 16
   cross-depended-by:
18
-    - name: openstack-controller
17
+    - name: primary-openstack-controller
19 18
       role: self
20 19
     - name: deploy_end
21 20
       role: self
22 21
   condition:
23
-    yaql_exp: >
22
+    yaql_exp: &cinder >
24 23
       changedAny($.network_scheme, $.cinder, $.network_metadata.vips,
25 24
       $.get('cinder_volume_group'), $.storage, $.ceilometer, $.sahara,
26 25
       $.rabbit, $.get('region', 'RegionOne'), $.get('use_ssl'),
@@ -39,16 +38,31 @@
39 38
     puppet_modules: /etc/puppet/modules
40 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 58
 - id: cinder-db
43 59
   type: puppet
44 60
   version: 2.2.0
45 61
   tags: [primary-database]
46
-  required_for: [openstack-cinder]
62
+  required_for: [primary-openstack-cinder]
47 63
   requires: [primary-database, database]
48 64
   cross-depends:
49 65
     - name: /^(primary-)?database$/
50
-  cross-depened-by:
51
-    - name: openstack-cinder
52 66
   condition:
53 67
     yaql_exp: >
54 68
       changedAny($.cinder, $.mysql, $.network_metadata.vips,
@@ -64,13 +78,11 @@
64 78
   type: puppet
65 79
   version: 2.2.0
66 80
   tags: [primary-keystone]
67
-  required_for: [openstack-cinder]
81
+  required_for: [primary-openstack-cinder]
68 82
   requires: [primary-keystone, keystone]
69 83
   cross-depends:
70 84
     - name: /^(primary-)?keystone$/
71 85
       role: self
72
-  cross-depended-by:
73
-    - name: openstack-cinder
74 86
   condition:
75 87
     yaql_exp: >
76 88
       changedAny($.cinder, $.public_ssl, $.get('use_ssl'),
@@ -84,7 +96,7 @@
84 96
   type: puppet
85 97
   version: 2.1.0
86 98
   groups: [primary-controller]
87
-  requires: [openstack-cinder]
99
+  requires: [primary-openstack-cinder]
88 100
   required_for: [deploy_end]
89 101
   condition:
90 102
     yaql_exp: "changed($.storage)"

+ 1
- 1
deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml View File

@@ -24,7 +24,7 @@
24 24
   version: 2.1.0
25 25
   groups: [primary-controller]
26 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 28
   condition:
29 29
     yaql_exp: &ceph_mon >
30 30
       ($.storage.objects_ceph or $.storage.images_ceph or

Loading…
Cancel
Save