Browse Source

Merge "Enable swift temporary URLs in grenade and provide a good error message" into stable/ussuri

changes/64/782764/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
37c7017bce
2 changed files with 8 additions and 1 deletions
  1. +6
    -1
      ironic/common/swift.py
  2. +2
    -0
      zuul.d/ironic-jobs.yaml

+ 6
- 1
ironic/common/swift.py View File

@ -131,7 +131,12 @@ class SwiftAPI(object):
parse_result = urlparse.urlparse(self.connection.url)
swift_object_path = '/'.join((parse_result.path, container, obj))
temp_url_key = account_info['x-account-meta-temp-url-key']
temp_url_key = account_info.get('x-account-meta-temp-url-key')
if not temp_url_key:
raise exception.MissingParameterValue(_(
'Swift temporary URLs require a shared secret to be '
'created. You must provide pre-generate the key on '
'the project used to access Swift.'))
url_path = swift_utils.generate_temp_url(swift_object_path, timeout,
temp_url_key, 'GET')
return urlparse.urlunparse(


+ 2
- 0
zuul.d/ironic-jobs.yaml View File

@ -777,6 +777,8 @@
IRONIC_REQUIRE_AGENT_TOKEN: False
Q_AGENT: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan
SWIFT_ENABLE_TEMPURLS: True
SWIFT_TEMPURL_KEY: secretkey
EBTABLES_RACE_FIX: True
old:
IRONIC_VM_LOG_DIR: '{{ devstack_bases.old }}/ironic-bm-logs'


Loading…
Cancel
Save