openstack
/
fuel-library
Code Issues Proposed changes

Adapt swift_temp_url_key params usage 

Adapt fuel-library for upstream patch https://review.openstack.org/#/c/365236
which manages swift_temp_url_key from ironic::conductor class.

Change-Id: Iaecaa116386a88e1c7c693cf5585a78435150659
Related-bug: #1620306
This commit is contained in:
iberezovskiy 2016-09-08 16:44:28 +03:00
parent 7e510abd55
commit ade96cbd10
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,11 +111,17 @@ class openstack_tasks::roles::ironic_conductor {
'keystone_authtoken/admin_user': value => $ironic_user;
'keystone_authtoken/admin_password': value => $ironic_user_password, secret => true;
'keystone_authtoken/memcached_servers': value => join(any2array($memcached_servers), ',');
'glance/swift_temp_url_key': value => $ironic_swift_tempurl_key;
'glance/swift_endpoint_url': value => "http://${baremetal_vip}:8080";
'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',