openstack
/
fuel-library
Code Issues Proposed changes

Configure swift_temp_url_key through ironic::conductor class 

Change-Id: I72446e4f7c7e1aa840f64594d369bdc35d5fd6ab
Closes-bug: #1620306
This commit is contained in:
iberezovskiy 2016-09-12 13:51:55 +03:00 committed by Ivan Berezovskiy
parent 211e873bdd
commit fe04b1a0b1
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp
View File

@ -94,7 +94,8 @@ class openstack_tasks::roles::ironic_conductor {
class { '::ironic::client': }
class { '::ironic::conductor':
api_url => "http://${baremetal_vip}:6385",
api_url => "http://${baremetal_vip}:6385",
swift_temp_url_key => $ironic_swift_tempurl_key,
}
class { '::ironic::drivers::pxe':
@ -115,13 +116,6 @@ class openstack_tasks::roles::ironic_conductor {
'glance/temp_url_endpoint_type': value => $temp_url_endpoint_type;
}
# TODO(iberezovskiy): remove this workaround when https://review.openstack.org/#/c/365236 is merged
if !defined(Ironic_config['glance/swift_temp_url_key']) {
ironic_config { 'glance/swift_temp_url_key': value => $ironic_swift_tempurl_key; }
} else {
Ironic_config<| title == 'glance/swift_temp_url_key' |> { value => $ironic_swift_tempurl_key }
}
file { $tftp_root:
ensure => directory,
owner => 'ironic',