Merge "[Ironic] Add enable_rados to requirments for Ironic tasks related to Swift"

This commit is contained in:
Jenkins 2015-11-24 18:21:33 +00:00 committed by Gerrit Code Review
commit ae564d690b

View File

@ -223,7 +223,7 @@
type: shell
role: [primary-controller]
condition: "settings:additional_components.ironic.value == true"
requires: [enable_quorum]
requires: [enable_quorum, enable_rados]
required_for: [post_deployment_end]
parameters:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/astute/ironic_post_swift_key.rb
@ -236,7 +236,7 @@
role: [primary-controller]
condition: "settings:additional_components.ironic.value == true"
required_for: [post_deployment_end]
requires: [enable_quorum]
requires: [enable_quorum, enable_rados]
parameters:
cmd: ruby /etc/puppet/modules/osnailyfacter/modular/ironic/upload_images.rb {CLUSTER_ID}
retries: 3