openstack
/
fuel-library
Code Issues Proposed changes

Bump version for all library tasks 

According to task-based deployment specification
the validator in nailgun checks all tasks version
New deployment engine can be turned on only if all
tasks have version >= 2.0.0
By this commit we confirm that all core tasks have
all dependencies including cross-node and are
ready to work with task-based deployment engine

Closes-Bug:#1528335
Change-Id: I57e52eb8a27bff5a6843c3297a7c97922b49774f
This commit is contained in:
Alexey Shtokolov 2015-12-21 23:16:47 +03:00
parent 12646476cb
commit 5f8a873627
39 changed files with 152 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/osnailyfacter/modular/apache/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: apache
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [keystone]
requires: [openstack-haproxy]

1
deployment/puppet/osnailyfacter/modular/api-proxy/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: api-proxy
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end, controller_remaining_tasks]
requires: [apache]

25
deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
View File

@ -1,6 +1,7 @@
# POST_DEPLOYMENT TASKS
- id: enable_quorum
type: shell
version: 2.0.0
role: [primary-controller]
requires: [post_deployment_start]
required_for: [post_deployment_end]
@ -10,6 +11,7 @@
- id: upload_cirros
type: shell
version: 2.0.0
role: [primary-controller]
requires: [enable_quorum]
required_for: [post_deployment_end]
@ -21,6 +23,7 @@
- id: upload_nodes_info
type: upload_file
version: 2.0.0
role: '*'
requires: [post_deployment_start]
parameters:
@ -28,6 +31,7 @@
- id: upload_configuration
type: upload_file
version: 2.0.0
role: '*'
requires: [override_configuration]
required_for: [pre_deployment_end]
@ -36,6 +40,7 @@
- id: update_hosts
type: puppet
version: 2.0.0
role: '*'
required_for: [post_deployment_end]
requires: [upload_nodes_info]
@ -47,6 +52,7 @@
- id: vcenter_compute_zones_create
type: shell
version: 2.0.0
role: [primary-controller, compute-vmware]
requires: [post_deployment_start]
required_for: [post_deployment_end]
@ -57,6 +63,7 @@
- id: enable_nova_compute_service
type: puppet
version: 2.0.0
role: [compute]
requires: [post_deployment_start]
required_for: [post_deployment_end]
@ -69,6 +76,7 @@
- id: enable_cinder_volume_service
type: puppet
version: 2.0.0
role: [cinder]
requires: [cinder, post_deployment_start]
required_for: [post_deployment_end]
@ -80,6 +88,7 @@
- id: disable_keystone_service_token
type: puppet
version: 2.0.0
role: [primary-controller, controller]
requires: [upload_cirros]
required_for: [post_deployment_end]
@ -93,6 +102,7 @@
- id: public_vip_ping
type: puppet
version: 2.0.0
role: [primary-controller, controller]
requires: [post_deployment_start]
required_for: [post_deployment_end]
@ -104,6 +114,7 @@
- id: configure_default_route
type: puppet
version: 2.0.0
role: [primary-mongo, mongo, compute, ceph-osd, cinder]
requires: [post_deployment_start]
required_for: [post_deployment_end]
@ -116,11 +127,13 @@
#PRE DEPLOYMENT
- id: upload_core_repos
type: upload_file
version: 2.0.0
role: '*'
requires: [pre_deployment_start]
- id: rsync_core_puppet
type: sync
version: 2.0.0
role: '*'
required_for: [pre_deployment_end]
requires: [upload_core_repos]
@ -132,6 +145,7 @@
- id: clear_nodes_info
type: shell
version: 2.0.0
role: '*'
requires: [pre_deployment_start]
required_for: [pre_deployment_end]
@ -141,6 +155,7 @@
- id: copy_keys
type: copy_files
version: 2.0.0
role: '*'
required_for: [pre_deployment_end]
requires: [generate_keys]
@ -172,6 +187,7 @@
- id: generate_keys
type: shell
version: 2.0.0
role: master
requires: [pre_deployment_start]
required_for: [copy_keys]
@ -181,6 +197,7 @@
- id: generate_haproxy_keys
type: shell
version: 2.0.0
role: master
requires: [pre_deployment_start]
condition: "(settings:public_ssl.horizon.value == true or settings:public_ssl.services.value == true) and settings:public_ssl.cert_source.value == 'self_signed'"
@ -191,6 +208,7 @@
- id: copy_haproxy_keys
type: copy_files
version: 2.0.0
role: '*'
required_for: [pre_deployment_end]
requires: [generate_haproxy_keys]
@ -209,6 +227,7 @@
- id: sync_time
type: shell
version: 2.0.0
role: '*'
requires: [pre_deployment_start]
required_for: [pre_deployment_end]
@ -220,6 +239,7 @@
- id: pre_hiera_config
type: puppet
version: 2.0.0
role: '*'
requires: [pre_deployment_start, rsync_core_puppet]
required_for: [pre_deployment_end]
@ -231,6 +251,7 @@
- id: override_configuration
type: puppet
version: 2.0.0
role: '*'
requires: [pre_hiera_config]
required_for: [pre_deployment_end]
@ -242,6 +263,7 @@
- id: dump_rabbitmq_definitions
type: puppet
version: 2.0.0
role: [primary-controller, controller]
requires: [post_deployment_start]
required_for: [post_deployment_end]
@ -253,6 +275,7 @@
- id: ironic_post_swift_key
type: shell
version: 2.0.0
role: [primary-controller]
condition: "settings:additional_components.ironic.value == true"
requires: [enable_quorum, enable_rados]
@ -265,6 +288,7 @@
- id: ironic_upload_images
type: shell
version: 2.0.0
role: [primary-controller]
condition: "settings:additional_components.ironic.value == true"
required_for: [post_deployment_end]
@ -277,6 +301,7 @@
- id: ironic_copy_bootstrap_key
type: copy_files
version: 2.0.0
role: [ironic]
condition: "settings:additional_components.ironic.value == true"
required_for: [pre_deployment_end]

4
deployment/puppet/osnailyfacter/modular/ceilometer/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: ceilometer-controller
type: puppet
version: 2.0.0
cross-depends:
- name: ceilometer-keystone
groups: [primary-controller, controller]
@ -17,6 +18,7 @@
- id: ceilometer-compute
type: puppet
version: 2.0.0
groups: [compute, compute-vmware]
required_for: [deploy_end]
requires: [ceilometer-controller, top-role-compute]
@ -34,6 +36,7 @@
- id: ceilometer-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [ceilometer-controller]
condition: "settings:additional_components.ceilometer.value == true"
@ -45,6 +48,7 @@
- id: ceilometer-radosgw-user
type: puppet
version: 2.0.0
role: [primary-controller, controller]
requires: [post_deployment_start, enable_rados]
required_for: [post_deployment_end]

11
deployment/puppet/osnailyfacter/modular/ceph/tasks.yaml
View File

@ -3,6 +3,7 @@
- id: copy_keys_ceph
type: copy_files
version: 2.0.0
role: '*'
required_for: [pre_deployment_end]
requires: [generate_keys_ceph]
@ -20,6 +21,7 @@
- id: generate_keys_ceph
type: shell
version: 2.0.0
role: master
requires: [pre_deployment_start]
required_for: [copy_keys_ceph]
@ -34,6 +36,7 @@
- id: top-role-ceph-osd
type: puppet
version: 2.0.0
groups: [ceph-osd]
required_for: [deploy_end]
requires: [hosts, firewall]
@ -47,6 +50,7 @@
- id: ceph-radosgw
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end, controller_remaining_tasks]
requires: [apache, ceph-mon, primary-ceph-mon]
@ -61,6 +65,7 @@
- id: primary-ceph-mon
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [deploy_end, controller_remaining_tasks]
requires: [openstack-controller]
@ -71,6 +76,7 @@
- id: ceph-mon
type: puppet
version: 2.0.0
groups: [controller]
required_for: [deploy_end, controller_remaining_tasks]
requires: [openstack-controller]
@ -87,6 +93,7 @@
- id: ceph-compute
type: puppet
version: 2.0.0
role: [compute]
cross-depends:
- name: ceph_create_pools
@ -103,6 +110,7 @@
- id: ceph_create_pools
type: puppet
version: 2.0.0
role: [primary-controller, controller]
requires: [post_deployment_start]
required_for: [ceph_ready_check]
@ -117,6 +125,7 @@
- id: ceph_ready_check
type: shell
version: 2.0.0
role: [primary-controller]
condition: "settings:storage.objects_ceph.value == true or settings:storage.images_ceph.value == true or settings:storage.volumes_ceph.value == true or settings:storage.ephemeral_ceph.value == true"
requires: [post_deployment_start]
@ -127,6 +136,7 @@
- id: enable_rados
type: puppet
version: 2.0.0
role: [primary-controller, controller]
condition: "settings:storage.objects_ceph.value == true"
requires: [post_deployment_start]
@ -141,6 +151,7 @@
- id: updatedb
type: puppet
version: 2.0.0
role: [primary-controller, controller, ceph-osd]
condition: "settings:storage.objects_ceph.value == true or settings:storage.images_ceph.value == true or settings:storage.volumes_ceph.value == true or settings:storage.ephemeral_ceph.value == true"
requires: [post_deployment_start]

2
deployment/puppet/osnailyfacter/modular/cluster-haproxy/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: primary-cluster-haproxy
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [deploy_end]
requires: [deploy_start, virtual_ips, primary-cluster]
@ -12,6 +13,7 @@
- id: cluster-haproxy
type: puppet
version: 2.0.0
groups: [controller]
required_for: [deploy_end]
requires: [deploy_start, virtual_ips, cluster]

1
deployment/puppet/osnailyfacter/modular/cluster-vrouter/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: cluster-vrouter
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [virtual_ips]
requires: [primary-cluster, cluster]

3
deployment/puppet/osnailyfacter/modular/cluster/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: cluster
type: puppet
version: 2.0.0
groups: [controller]
cross-depends:
- name: primary-cluster
@ -14,6 +15,7 @@
- id: primary-cluster
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [deploy_end]
requires: [hosts, firewall, deploy_start]
@ -26,6 +28,7 @@
- id: cluster_health
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [primary-cluster, cluster]

2
deployment/puppet/osnailyfacter/modular/database/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: database
type: puppet
version: 2.0.0
groups: [controller]
required_for: [openstack-controller]
requires: [deploy_start, openstack-haproxy]
@ -16,6 +17,7 @@
- id: primary-database
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-controller]
requires: [deploy_start, openstack-haproxy]

3
deployment/puppet/osnailyfacter/modular/dns/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: primary-dns-server
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [deploy_end]
requires: [openstack-haproxy]
@ -10,6 +11,7 @@
- id: dns-server
type: puppet
version: 2.0.0
groups: [controller]
required_for: [deploy_end]
requires: [openstack-haproxy]
@ -22,6 +24,7 @@
- id: dns-client
type: puppet
version: 2.0.0
role: [primary-mongo, mongo, primary-controller, controller, compute, ceph-osd, cinder, cinder-vmware]
requires: [post_deployment_start]
required_for: [ntp-client]

1
deployment/puppet/osnailyfacter/modular/firewall/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: firewall
type: puppet
version: 2.0.0
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, primary-mongo, mongo, ironic]
required_for: [deploy_end]
requires: [netconfig]

1
deployment/puppet/osnailyfacter/modular/fuel_pkgs/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: fuel_pkgs
type: puppet
version: 2.0.0
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, primary-mongo, mongo, ironic]
requires: [deploy_start]
required_for: [hiera]

1
deployment/puppet/osnailyfacter/modular/generate_vms/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: generate_vms
type: puppet
version: 2.0.0
groups: [virt]
requires: [netconfig]
required_for: [deploy_end]

3
deployment/puppet/osnailyfacter/modular/glance/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: glance
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [openstack-controller]
requires: [openstack-haproxy, primary-database, database]
@ -14,6 +15,7 @@
- id: glance-db
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [glance]
requires: [primary-database, database]
@ -26,6 +28,7 @@
- id: glance-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [glance]
requires: [keystone]

1
deployment/puppet/osnailyfacter/modular/globals/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: globals
type: puppet
version: 2.0.0
groups: [primary-controller, controller,
cinder, cinder-vmware, compute, ceph-osd,
primary-mongo, mongo, virt, ironic]

3
deployment/puppet/osnailyfacter/modular/heat/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: heat
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [openstack-controller]
@ -14,6 +15,7 @@
- id: heat-db
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [heat]
requires: [primary-database, database]
@ -26,6 +28,7 @@
- id: heat-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [heat]
requires: [keystone]

1
deployment/puppet/osnailyfacter/modular/hiera/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: hiera
type: puppet
version: 2.0.0
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, primary-mongo, mongo, virt, ironic]
requires: [deploy_start]
required_for: [deploy_end]

1
deployment/puppet/osnailyfacter/modular/horizon/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: horizon
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [openstack-controller]

1
deployment/puppet/osnailyfacter/modular/hosts/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: hosts
type: puppet
version: 2.0.0
groups: [primary-controller, controller, cinder,cinder-vmware, compute, ceph-osd, primary-mongo, mongo, ironic]
required_for: [deploy_end]
requires: [netconfig]

3
deployment/puppet/osnailyfacter/modular/ironic/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: ironic-api
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
condition: "settings:additional_components.ironic.value == true"
required_for: [openstack-controller]
@ -11,6 +12,7 @@
- id: ironic-db
type: puppet
version: 2.0.0
groups: [primary-controller]
cross-depends:
- name: /(primary-)?database/
@ -24,6 +26,7 @@
- id: ironic-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
condition: "settings:additional_components.ironic.value == true"
required_for: [ironic-api]

3
deployment/puppet/osnailyfacter/modular/keystone/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: keystone
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [openstack-controller]
requires: [openstack-haproxy, database, primary-rabbitmq, rabbitmq, primary-database]
@ -18,6 +19,7 @@
- id: keystone-db
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [keystone]
requires: [primary-database, database]
@ -31,6 +33,7 @@
- id: workloads_collector_add
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [deploy_end]
requires: [keystone]

1
deployment/puppet/osnailyfacter/modular/logging/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: logging
type: puppet
version: 2.0.0
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, primary-mongo, mongo, virt, ironic]
required_for: [deploy_end]
requires: [globals]

1
deployment/puppet/osnailyfacter/modular/memcached/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: memcached
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end, keystone]
requires: [openstack-haproxy]

6
deployment/puppet/osnailyfacter/modular/murano/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: murano
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
condition: "settings:additional_components.murano.value == true"
required_for: [deploy_end, controller_remaining_tasks]
@ -15,6 +16,7 @@
- id: murano-db
type: puppet
version: 2.0.0
groups: [primary-controller]
cross-depends:
- name: /(primary-)?database/
@ -28,6 +30,7 @@
- id: murano-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
condition: "settings:additional_components.murano.value == true"
required_for: [murano]
@ -39,6 +42,7 @@
- id: murano-rabbitmq
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
condition: "settings:additional_components.murano.value == true"
required_for: [murano]
@ -53,6 +57,7 @@
- id: murano-cfapi
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
condition: "settings:additional_components.murano-cfapi.value == true"
requires: [murano]
@ -63,6 +68,7 @@
- id: murano-cfapi-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
condition: "settings:additional_components.murano-cfapi.value == true"
required_for: [murano-cfapi]

2
deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: netconfig
type: puppet
version: 2.0.0
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, primary-mongo, mongo, virt, ironic]
required_for: [deploy_end]
requires: [tools]
@ -15,6 +16,7 @@
- id: connectivity_tests
type: puppet
version: 2.0.0
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, primary-mongo, mongo, virt, ironic]
required_for: [firewall, hosts]
requires: [netconfig]

3
deployment/puppet/osnailyfacter/modular/ntp/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: ntp-server
type: puppet
version: 2.0.0
role: [primary-controller, controller]
required_for: [ntp-client]
requires: [dns-client]
@ -14,6 +15,7 @@
- id: ntp-client
type: puppet
version: 2.0.0
role: [primary-mongo, mongo, compute, ceph-osd, cinder, cinder-vmware]
requires: [dns-client]
cross-depends:
@ -30,6 +32,7 @@
- id: ntp-check
type: puppet
version: 2.0.0
role: [primary-controller, controller]
required_for: [ntp-server]
requires: [dns-client]

3
deployment/puppet/osnailyfacter/modular/openstack-cinder/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: openstack-cinder
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end, openstack-controller]
requires: [primary-rabbitmq, rabbitmq, keystone, hosts, firewall]
@ -10,6 +11,7 @@
- id: cinder-db
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-cinder]
requires: [primary-database, database]
@ -22,6 +24,7 @@
- id: cinder-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-cinder]
cross-depends:

3
deployment/puppet/osnailyfacter/modular/openstack-controller/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: openstack-controller
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [openstack-haproxy]
@ -13,6 +14,7 @@
- id: nova-db
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-controller]
requires: [primary-database, database]
@ -25,6 +27,7 @@
- id: nova-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-controller]
requires: [keystone]

16
deployment/puppet/osnailyfacter/modular/openstack-haproxy/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: openstack-haproxy
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, openstack-haproxy-ceilometer, openstack-haproxy-cinder, openstack-haproxy-glance, openstack-haproxy-heat, openstack-haproxy-horizon, openstack-haproxy-keystone, openstack-haproxy-murano, openstack-haproxy-mysqld, openstack-haproxy-neutron, openstack-haproxy-nova, openstack-haproxy-radosgw, openstack-haproxy-sahara, openstack-haproxy-swift, openstack-haproxy-stats, openstack-haproxy-ironic]
@ -12,6 +13,7 @@
- id: openstack-haproxy-horizon
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -29,6 +31,7 @@
- id: openstack-haproxy-keystone
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [primary-cluster-haproxy, cluster-haproxy]
@ -46,6 +49,7 @@
- id: openstack-haproxy-nova
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -63,6 +67,7 @@
- id: openstack-haproxy-heat
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -80,6 +85,7 @@
- id: openstack-haproxy-glance
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -97,6 +103,7 @@
- id: openstack-haproxy-cinder
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -114,6 +121,7 @@
- id: openstack-haproxy-neutron
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -131,6 +139,7 @@
- id: openstack-haproxy-mysqld
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -148,6 +157,7 @@
- id: openstack-haproxy-swift
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -165,6 +175,7 @@
- id: openstack-haproxy-radosgw
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -182,6 +193,7 @@
- id: openstack-haproxy-ceilometer
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -199,6 +211,7 @@
- id: openstack-haproxy-sahara
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -216,6 +229,7 @@
- id: openstack-haproxy-murano
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -233,6 +247,7 @@
- id: openstack-haproxy-stats
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [deploy_start, primary-cluster-haproxy, cluster-haproxy]
@ -248,6 +263,7 @@
- id: openstack-haproxy-ironic
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
condition: "settings:additional_components.ironic.value == true"
required_for: [deploy_end]

19
deployment/puppet/osnailyfacter/modular/openstack-network/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: neutron-db
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-network-end]
requires: [primary-database, database]
@ -12,6 +13,7 @@
- id: neutron-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-network-end]
requires: [keystone]
@ -25,6 +27,7 @@
# Anchor (empty task) for another tasks, say 'tenant network FW setup starting'
- id: openstack-network-start
type: skipped
version: 2.0.0
groups: [primary-controller,controller,compute]
requires: [neutron-keystone, neutron-db, netconfig, openstack-controller, top-role-compute]
required_for: [openstack-network-common-config]
@ -35,6 +38,7 @@
- id: openstack-network-common-config
type: puppet
version: 2.0.0
groups: [primary-controller,controller,compute]
required_for: [openstack-network-end]
requires: [openstack-network-start]
@ -45,6 +49,7 @@
- id: openstack-network-server-config
type: puppet
version: 2.0.0
groups: [primary-controller,controller]
required_for: [openstack-network-end]
requires: [openstack-network-common-config]
@ -56,6 +61,7 @@
- id: primary-openstack-network-plugins-l2
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-network-end]
requires: [openstack-network-common-config, openstack-network-server-config]
@ -68,6 +74,7 @@
- id: openstack-network-plugins-l2
type: puppet
version: 2.0.0
groups: [controller,compute]
required_for: [openstack-network-end]
requires: [openstack-network-common-config, openstack-network-server-config]
@ -81,6 +88,7 @@
- id: openstack-network-networks
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-network-end]
requires: [primary-openstack-network-plugins-l2]
@ -91,6 +99,7 @@
- id: openstack-network-routers
type: puppet
version: 2.0.0
groups: [primary-controller]
condition: "settings:neutron_advanced_configuration.neutron_l3_ha.value == false"
required_for: [openstack-network-end]
@ -104,6 +113,7 @@
# HA routers must be created on post-deployment step when all L3 agents are available
- id: openstack-network-routers-ha
type: puppet
version: 2.0.0
role: [primary-controller]
condition: "settings:neutron_advanced_configuration.neutron_l3_ha.value == true"
required_for: [post_deployment_end]
@ -116,6 +126,7 @@
- id: primary-openstack-network-agents-l3
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-network-end]
requires: [openstack-network-networks, openstack-network-routers, primary-openstack-network-plugins-l2, openstack-network-plugins-l2]
@ -128,6 +139,7 @@
- id: openstack-network-agents-l3
type: puppet
version: 2.0.0
groups: [controller,compute]
required_for: [openstack-network-end]
requires: [openstack-network-networks, openstack-network-routers, primary-openstack-network-plugins-l2, openstack-network-plugins-l2]
@ -142,6 +154,7 @@
- id: openstack-network-server-nova
type: puppet
version: 2.0.0
groups: [primary-controller,controller]
required_for: [openstack-network-end]
requires: [openstack-network-agents-l3]
@ -155,6 +168,7 @@
- id: primary-openstack-network-agents-dhcp
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-network-end]
requires: [openstack-network-common-config,openstack-network-server-nova,openstack-network-agents-l3]
@ -169,6 +183,7 @@
- id: openstack-network-agents-dhcp
type: puppet
version: 2.0.0
groups: [controller]
required_for: [openstack-network-end]
requires: [openstack-network-common-config,openstack-network-server-nova,openstack-network-agents-l3]
@ -183,6 +198,7 @@
- id: primary-openstack-network-agents-metadata
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [openstack-network-end]
requires: [openstack-network-common-config,openstack-network-server-nova,openstack-network-agents-l3]
@ -198,6 +214,7 @@
- id: openstack-network-agents-metadata
type: puppet
version: 2.0.0
groups: [controller,compute]
required_for: [openstack-network-end]
requires: [openstack-network-common-config,openstack-network-server-nova,openstack-network-agents-l3]
@ -212,6 +229,7 @@
- id: openstack-network-compute-nova
type: puppet
version: 2.0.0
groups: [compute]
required_for: [openstack-network-end]
requires: [openstack-network-common-config,openstack-network-agents-l3,openstack-network-agents-metadata]
@ -225,6 +243,7 @@
# Anchor (empty task) for another tasks, say 'tenant network FW setup done'
- id: openstack-network-end
type: skipped
version: 2.0.0
groups: [primary-controller,controller,compute]
required_for: [deploy_end]
requires: []

2
deployment/puppet/osnailyfacter/modular/rabbitmq/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: rabbitmq
type: puppet
version: 2.0.0
groups: [controller]
cross-depends:
- name: primary-rabbitmq
@ -13,6 +14,7 @@
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/rabbitmq/rabbitmq_post.rb
- id: primary-rabbitmq
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [deploy_end, openstack-controller, glance]
requires: [openstack-haproxy]

7
deployment/puppet/osnailyfacter/modular/roles/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: controller_remaining_tasks
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
parameters:
@ -9,6 +10,7 @@
- id: top-role-compute
type: puppet
version: 2.0.0
groups: [compute]
required_for: [deploy_end]
requires: [hosts, firewall]
@ -24,6 +26,7 @@
- id: top-role-cinder
type: puppet
version: 2.0.0
groups: [cinder, cinder-block-device, cinder-vmware]
required_for: [deploy_end]
requires: [hosts, firewall]
@ -36,6 +39,7 @@
- id: top-role-primary-mongo
type: puppet
version: 2.0.0
groups: [primary-mongo]
required_for: [deploy_end]
requires: [hosts, firewall]
@ -46,6 +50,7 @@
- id: top-role-mongo
type: puppet
version: 2.0.0
groups: [mongo]
required_for: [deploy_end]
requires: [hosts, firewall]
@ -56,6 +61,7 @@
- id: ironic-conductor
type: puppet
version: 2.0.0
groups: [ironic]
required_for: [deploy_end]
requires: [hosts, firewall]
@ -69,6 +75,7 @@
- id: ironic-compute
type: puppet
version: 2.0.0
groups: [ironic]
required_for: [deploy_end]
requires: [hosts, firewall, ironic-conductor]

3
deployment/puppet/osnailyfacter/modular/sahara/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: sahara
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
condition: "settings:additional_components.sahara.value == true"
required_for: [deploy_end, controller_remaining_tasks]
@ -15,6 +16,7 @@
- id: sahara-db
type: puppet
version: 2.0.0
groups: [primary-controller]
cross-depends:
- name: /(primary-)?database/
@ -28,6 +30,7 @@
- id: sahara-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [sahara]
requires: [keystone]

3
deployment/puppet/osnailyfacter/modular/ssl/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: ssl-keys-saving
type: puppet
version: 2.0.0
groups: [primary-controller, controller, compute, compute-vmware, cinder, cinder-vmware, primary-mongo, mongo, ceph-osd, virt]
requires: [firewall]
condition: "(settings:public_ssl.horizon.value == true or settings:public_ssl.services.value == true) and settings:public_ssl.cert_source.value == 'user_uploaded'"
@ -13,6 +14,7 @@
- id: ssl-add-trust-chain
type: puppet
version: 2.0.0
groups: [primary-controller, controller, compute, compute-vmware, cinder, cinder-vmware, primary-mongo, mongo, ceph-osd, virt]
requires: [firewall, ssl-keys-saving]
condition: "settings:public_ssl.horizon.value == true or settings:public_ssl.services.value == true"
@ -26,6 +28,7 @@
- id: ssl-dns-setup
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
requires: [firewall, ssl-add-trust-chain]
condition: "settings:public_ssl.horizon.value == true or settings:public_ssl.services.value == true"

4
deployment/puppet/osnailyfacter/modular/swift/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: swift
type: puppet
version: 2.0.0
groups: [controller]
required_for: [deploy_end, controller_remaining_tasks]
requires: [openstack-controller]
@ -16,6 +17,7 @@
- id: primary-swift
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [deploy_end, controller_remaining_tasks]
requires: [openstack-controller]
@ -32,6 +34,7 @@
- id: swift-rebalance-cron
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [swift]
@ -49,6 +52,7 @@
- id: swift-keystone
type: puppet
version: 2.0.0
groups: [primary-controller]
required_for: [swift]
cross-depends:

1
deployment/puppet/osnailyfacter/modular/tools/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: tools
type: puppet
version: 2.0.0
groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, primary-mongo, mongo, virt, ironic]
required_for: [deploy_end]
requires: [logging]

1
deployment/puppet/osnailyfacter/modular/umm/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: umm
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [tools]

2
deployment/puppet/osnailyfacter/modular/virtual_ips/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: virtual_ips
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [primary-cluster,cluster]
@ -15,6 +16,7 @@
- id: conntrackd
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [virtual_ips,cluster,primary-cluster]

3
deployment/puppet/osnailyfacter/modular/vmware/tasks.yaml
View File

@ -1,5 +1,6 @@
- id: vmware-vcenter
type: puppet
version: 2.0.0
groups: [primary-controller, controller]
required_for: [deploy_end]
requires: [controller_remaining_tasks]
@ -11,6 +12,7 @@
- id: top-role-cinder-vmware
type: puppet
version: 2.0.0
groups: [cinder-vmware]
required_for: [deploy_end]
requires: [top-role-cinder]
@ -26,6 +28,7 @@
- id: top-role-compute-vmware
type: puppet
version: 2.0.0
groups: [compute-vmware]
required_for: [deploy_end]
requires: [top-role-compute, ceilometer-compute, ceilometer-keystone]