Merge "Split out openstack-cinder task"
This commit is contained in:
commit
d703ed79f0
|
@ -1,9 +1,9 @@
|
||||||
- id: openstack-cinder
|
- id: primary-openstack-cinder
|
||||||
type: puppet
|
type: puppet
|
||||||
version: 2.2.0
|
version: 2.2.0
|
||||||
tags: [primary-controller, controller]
|
tags: [primary-controller]
|
||||||
required_for: [deploy_end, openstack-controller]
|
required_for: [deploy_end, primary-openstack-controller]
|
||||||
requires: [primary-keystone, keystone, hosts, firewall]
|
requires: [primary-keystone, hosts, firewall]
|
||||||
cross-depends:
|
cross-depends:
|
||||||
- name: /^(primary-)?keystone$/
|
- name: /^(primary-)?keystone$/
|
||||||
- name: hosts
|
- name: hosts
|
||||||
|
@ -13,14 +13,13 @@
|
||||||
- name: /^(primary-)?rabbitmq$/
|
- name: /^(primary-)?rabbitmq$/
|
||||||
- name: cinder-db
|
- name: cinder-db
|
||||||
- name: cinder-keystone
|
- name: cinder-keystone
|
||||||
|
|
||||||
cross-depended-by:
|
cross-depended-by:
|
||||||
- name: openstack-controller
|
- name: primary-openstack-controller
|
||||||
role: self
|
role: self
|
||||||
- name: deploy_end
|
- name: deploy_end
|
||||||
role: self
|
role: self
|
||||||
condition:
|
condition:
|
||||||
yaql_exp: >
|
yaql_exp: &cinder >
|
||||||
changedAny($.network_scheme, $.cinder, $.network_metadata.vips,
|
changedAny($.network_scheme, $.cinder, $.network_metadata.vips,
|
||||||
$.get('cinder_volume_group'), $.storage, $.ceilometer, $.sahara,
|
$.get('cinder_volume_group'), $.storage, $.ceilometer, $.sahara,
|
||||||
$.rabbit, $.get('region', 'RegionOne'), $.get('use_ssl'),
|
$.rabbit, $.get('region', 'RegionOne'), $.get('use_ssl'),
|
||||||
|
@ -39,16 +38,31 @@
|
||||||
puppet_modules: /etc/puppet/modules
|
puppet_modules: /etc/puppet/modules
|
||||||
timeout: 1200
|
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
|
- id: cinder-db
|
||||||
type: puppet
|
type: puppet
|
||||||
version: 2.2.0
|
version: 2.2.0
|
||||||
tags: [primary-database]
|
tags: [primary-database]
|
||||||
required_for: [openstack-cinder]
|
required_for: [primary-openstack-cinder]
|
||||||
requires: [primary-database, database]
|
requires: [primary-database, database]
|
||||||
cross-depends:
|
cross-depends:
|
||||||
- name: /^(primary-)?database$/
|
- name: /^(primary-)?database$/
|
||||||
cross-depened-by:
|
|
||||||
- name: openstack-cinder
|
|
||||||
condition:
|
condition:
|
||||||
yaql_exp: >
|
yaql_exp: >
|
||||||
changedAny($.cinder, $.mysql, $.network_metadata.vips,
|
changedAny($.cinder, $.mysql, $.network_metadata.vips,
|
||||||
|
@ -64,13 +78,11 @@
|
||||||
type: puppet
|
type: puppet
|
||||||
version: 2.2.0
|
version: 2.2.0
|
||||||
tags: [primary-keystone]
|
tags: [primary-keystone]
|
||||||
required_for: [openstack-cinder]
|
required_for: [primary-openstack-cinder]
|
||||||
requires: [primary-keystone, keystone]
|
requires: [primary-keystone, keystone]
|
||||||
cross-depends:
|
cross-depends:
|
||||||
- name: /^(primary-)?keystone$/
|
- name: /^(primary-)?keystone$/
|
||||||
role: self
|
role: self
|
||||||
cross-depended-by:
|
|
||||||
- name: openstack-cinder
|
|
||||||
condition:
|
condition:
|
||||||
yaql_exp: >
|
yaql_exp: >
|
||||||
changedAny($.cinder, $.public_ssl, $.get('use_ssl'),
|
changedAny($.cinder, $.public_ssl, $.get('use_ssl'),
|
||||||
|
@ -84,7 +96,7 @@
|
||||||
type: puppet
|
type: puppet
|
||||||
version: 2.1.0
|
version: 2.1.0
|
||||||
groups: [primary-controller]
|
groups: [primary-controller]
|
||||||
requires: [openstack-cinder]
|
requires: [primary-openstack-cinder]
|
||||||
required_for: [deploy_end]
|
required_for: [deploy_end]
|
||||||
condition:
|
condition:
|
||||||
yaql_exp: "changed($.storage)"
|
yaql_exp: "changed($.storage)"
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
version: 2.1.0
|
version: 2.1.0
|
||||||
groups: [primary-controller]
|
groups: [primary-controller]
|
||||||
required_for: [deploy_end, controller_remaining_tasks]
|
required_for: [deploy_end, controller_remaining_tasks]
|
||||||
requires: [primary-openstack-controller, openstack-controller, openstack-cinder]
|
requires: [primary-openstack-controller, primary-openstack-cinder]
|
||||||
condition:
|
condition:
|
||||||
yaql_exp: &ceph_mon >
|
yaql_exp: &ceph_mon >
|
||||||
($.storage.objects_ceph or $.storage.images_ceph or
|
($.storage.objects_ceph or $.storage.images_ceph or
|
||||||
|
|
Loading…
Reference in New Issue